summaryrefslogtreecommitdiff
path: root/t/t7610-mergetool.sh
AgeCommit message (Expand)AuthorFilesLines
2010-11-09tests: add missing &&Libravatar Jonathan Nieder1-1/+1
2010-08-24t7610: cd inside subshell instead of aroundLibravatar Brian Gernhardt1-23/+26
2010-08-17mergetool: Skip autoresolved pathsLibravatar David Aguilar1-12/+34
2009-01-31mergetool: fix running mergetool in sub-directoriesLibravatar Charles Bailey1-1/+1
2009-01-31mergetool: Add a test for running mergetool in a sub-directoryLibravatar Charles Bailey1-19/+51
2009-01-27mergetool: respect autocrlf by using checkout-indexLibravatar Charles Bailey1-2/+13
2008-09-03tests: use "git xyzzy" form (t7200 - t9001)Libravatar Nanako Shiraishi1-1/+1
2008-07-13t/: Use "test_must_fail git" instead of "! git"Libravatar Stephan Beyer1-1/+1
2008-07-04Fix executable bits in t/ scriptsLibravatar Junio C Hamano1-0/+0
2008-03-05Add a very basic test script for git mergetoolLibravatar Charles Bailey1-0/+46