diff options
Diffstat (limited to 't/t7610-mergetool.sh')
| -rwxr-xr-x | t/t7610-mergetool.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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 && |