X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft7610-mergetool.sh;h=d78bdec330cd8b9505aa92ff2e81e0f716b9a741;hb=0137ef7dae553f9eb89cbae1ddb60b72046ba28b;hp=3bd74042ef46ee8b4e4477d1c23ba0914963de33;hpb=47f16e8b110d84bacb586a1b7183ee4bb781c980;p=git.git diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh index 3bd74042e..d78bdec33 100755 --- a/t/t7610-mergetool.sh +++ b/t/t7610-mergetool.sh @@ -54,7 +54,7 @@ test_expect_success 'custom mergetool' ' test_expect_success 'mergetool crlf' ' git config core.autocrlf true && - git checkout -b test2 branch1 + git checkout -b test2 branch1 && test_must_fail git merge master >/dev/null 2>&1 && ( yes "" | git mergetool file1 >/dev/null 2>&1 ) && ( yes "" | git mergetool file2 >/dev/null 2>&1 ) &&