aboutsummaryrefslogtreecommitdiff
path: root/t/t7610-mergetool.sh
Commit message (Expand)AuthorAge
* stash: invoke rerere in case of conflictPhil Hord2012-08-17
* test: git-stash conflict sets up rererePhil Hord2012-08-17
* mergetool: Provide an empty file when neededDavid Aguilar2012-01-23
* mergetool: Use args as pathspec to unmerged filesJonathon Mah2011-09-26
* mergetool: Teach about submodulesJonathon Mah2011-04-13
* mergetool: don't skip modify/remove conflictsMartin von Zweigbergk2011-02-16
* tests: add missing &&Jonathan Nieder2010-11-09
* t7610: cd inside subshell instead of aroundBrian Gernhardt2010-08-24
* mergetool: Skip autoresolved pathsDavid Aguilar2010-08-17
* mergetool: fix running mergetool in sub-directoriesCharles Bailey2009-01-31
* mergetool: Add a test for running mergetool in a sub-directoryCharles Bailey2009-01-31
* mergetool: respect autocrlf by using checkout-indexCharles Bailey2009-01-27
* tests: use "git xyzzy" form (t7200 - t9001)Nanako Shiraishi2008-09-03
* t/: Use "test_must_fail git" instead of "! git"Stephan Beyer2008-07-13
* Fix executable bits in t/ scriptsJunio C Hamano2008-07-04
* Add a very basic test script for git mergetoolCharles Bailey2008-03-05
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-15 10:49:04 +0000