summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorLibravatar Charles Bailey <charles@hashpling.org>2008-02-21 23:31:56 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-03-05 12:07:04 -0800
commit05e934bb9f7767e13e8a658b0e429a40076a6b35 (patch)
treedc907dcc748635a7579b2ff9e51f92b44d3721b7 /contrib
parentTeach git mergetool to use custom commands defined at config time (diff)
downloadtgif-05e934bb9f7767e13e8a658b0e429a40076a6b35.tar.xz
Add a very basic test script for git mergetool
Signed-off-by: Charles Bailey <charles@hashpling.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib')
0 files changed, 0 insertions, 0 deletions