summaryrefslogtreecommitdiff
path: root/t/t7610-mergetool.sh
Commit message (Collapse)AuthorAgeFilesLines
* Add a very basic test script for git mergetoolCharles Bailey2008-03-051-0/+46
Signed-off-by: Charles Bailey <charles@hashpling.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>