summaryrefslogtreecommitdiff
path: root/git-mergetool.sh
diff options
context:
space:
mode:
authorCharles Bailey <charles@hashpling.org>2009-01-30 23:20:10 +0000
committerJunio C Hamano <gitster@pobox.com>2009-01-31 10:18:33 -0800
commitb9b5078ece4b22c14a36f20bd9dce88d2f350a36 (patch)
treebb7e1f4b95e2c79c2d7c717304b0926105414e14 /git-mergetool.sh
parent0ec7b6c26dad51f690cd985d4a5357634123c4b7 (diff)
downloadgit-b9b5078ece4b22c14a36f20bd9dce88d2f350a36.tar.gz
mergetool: Add a test for running mergetool in a sub-directory
Signed-off-by: Charles Bailey <charles@hashpling.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions