Merge branch 'rs/archive-parse-options'

diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index 9ab5bdacc41d026ea81c65b0d95a61a61521429a..5eeb6c2b2708d582a6e86cd2e06e2b00b7b7b391 100755 (executable)
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
@@ -126,7 +126,7 @@ verify_merge() {
                echo "[OOPS] unmerged files"
                false
        fi &&
-       if ! git diff --exit-code
+       if test_must_fail git diff --exit-code
        then
                echo "[OOPS] working tree != index"
                false
@@ -221,7 +221,7 @@ test_expect_success 'setup' '
 
 test_debug 'gitk --all'
 
-test_expect_failure 'test option parsing' '
+test_expect_success 'test option parsing' '
        test_must_fail git merge -$ c1 &&
        test_must_fail git merge --no-such c1 &&
        test_must_fail git merge -s foobar c1 &&