Merge branch 'jn/gitweb-install-doc'

diff --git a/t/t2200-add-update.sh b/t/t2200-add-update.sh
index c317254b9a82befd3400d300f85ecfd661d1a948..b2bd41918ee7f8b19e3ef906f27796f331ed9ea5 100755 (executable)
--- a/t/t2200-add-update.sh
+++ b/t/t2200-add-update.sh
@@ -166,9 +166,9 @@ test_expect_success 'add -u resolves unmerged paths' '
        echo 2 >path3 &&
        echo 2 >path5 &&
 
-       # Explicit resolving by adding removed paths should fail
-       test_must_fail git add path4 &&
-       test_must_fail git add path6 &&
+       # Fail to explicitly resolve removed paths with "git add"
+       test_must_fail git add --no-all path4 &&
+       test_must_fail git add --no-all path6 &&
 
        # "add -u" should notice removals no matter what stages
        # the index entries are in.