X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=inline;f=t%2Ft7610-mergetool.sh;h=e768c3eb2d48a9af2fc92729a6c20126f67ec866;hb=e7c2466593f5c8682a4fe7146f17b80acf134675;hp=ee8589e8cde0bfc7317e7e9e72972475fd2f628a;hpb=b9b5078ece4b22c14a36f20bd9dce88d2f350a36;p=git.git

diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh
index ee8589e8c..e768c3eb2 100755
--- a/t/t7610-mergetool.sh
+++ b/t/t7610-mergetool.sh
@@ -66,7 +66,7 @@ test_expect_success 'mergetool crlf' '
     git reset --hard
 '
 
-test_expect_failure 'mergetool in subdir' '
+test_expect_success 'mergetool in subdir' '
     git checkout -b test3 branch1
     cd subdir && (
     test_must_fail git merge master >/dev/null 2>&1 &&