Remove unnecessary git-subtree files

[git.git] / t / t6037-merge-ours-theirs.sh

diff --git a/t/t6037-merge-ours-theirs.sh b/t/t6037-merge-ours-theirs.sh
index 8ab3d61f445725ec48b8b4ce28cfbf4a9ce13844..2cf42c73f14ef5069d096fb29e67dac571227cfe 100755 (executable)
--- a/t/t6037-merge-ours-theirs.sh
+++ b/t/t6037-merge-ours-theirs.sh
@@ -58,7 +58,7 @@ test_expect_success 'pull with -X' '
        git reset --hard master && git pull -s recursive -X ours . side &&
        git reset --hard master && git pull -s recursive -Xtheirs . side &&
        git reset --hard master && git pull -s recursive -X theirs . side &&
-       git reset --hard master && ! git pull -s recursive -X bork . side
+       git reset --hard master && test_must_fail git pull -s recursive -X bork . side
 '
 
 test_done