summaryrefslogtreecommitdiff
path: root/t/t7610-mergetool.sh
AgeCommit message (Expand)Author
2009-01-31mergetool: fix running mergetool in sub-directoriesCharles Bailey
2009-01-31mergetool: Add a test for running mergetool in a sub-directoryCharles Bailey
2009-01-27mergetool: respect autocrlf by using checkout-indexCharles Bailey
2008-09-03tests: use "git xyzzy" form (t7200 - t9001)Nanako Shiraishi
2008-07-13t/: Use "test_must_fail git" instead of "! git"Stephan Beyer
2008-07-04Fix executable bits in t/ scriptsJunio C Hamano
2008-03-05Add a very basic test script for git mergetoolCharles Bailey