aboutsummaryrefslogtreecommitdiff
path: root/t/t7610-mergetool.sh
Commit message (Collapse)AuthorAge
* Fix executable bits in t/ scriptsJunio C Hamano2008-07-04
| | | | | | Pointed out by Ramsay Jones. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Add a very basic test script for git mergetoolCharles Bailey2008-03-05
Signed-off-by: Charles Bailey <charles@hashpling.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>