Code

mergetool: Add a test for running mergetool in a sub-directory
authorCharles Bailey <charles@hashpling.org>
Fri, 30 Jan 2009 23:20:10 +0000 (23:20 +0000)
committerJunio C Hamano <gitster@pobox.com>
Sat, 31 Jan 2009 18:18:33 +0000 (10:18 -0800)
commitb9b5078ece4b22c14a36f20bd9dce88d2f350a36
treebb7e1f4b95e2c79c2d7c717304b0926105414e14
parent0ec7b6c26dad51f690cd985d4a5357634123c4b7
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>
t/t7610-mergetool.sh