Merge branch 'rs/no-null-ptr-arith-in-fast-export'

diff --git a/t/t6022-merge-rename.sh b/t/t6022-merge-rename.sh
index 48747e71df82bf20e053ac9475608ae9d9071d51..b760c223c6a56609b7dace5353671aec8243b85d 100755 (executable)
--- a/t/t6022-merge-rename.sh
+++ b/t/t6022-merge-rename.sh
@@ -247,7 +247,7 @@ test_expect_success 'merge of identical changes in a renamed file' '
        git reset --hard HEAD^ &&
        git checkout change &&
        GIT_MERGE_VERBOSITY=3 git merge change+rename >out &&
-       test_i18ngrep "^Skipped B" out
+       test_i18ngrep ! "^Skipped B" out
 '
 
 test_expect_success 'setup for rename + d/f conflicts' '