summaryrefslogtreecommitdiff
path: root/t/t7610-mergetool.sh
Commit message (Expand)AuthorAgeFilesLines
* t/: Use "test_must_fail git" instead of "! git"Stephan Beyer2008-07-131-1/+1
* Fix executable bits in t/ scriptsJunio C Hamano2008-07-041-0/+0
* Add a very basic test script for git mergetoolCharles Bailey2008-03-051-0/+46