merge: pass aggressive when rename detection is turned off
[gitweb.git] / t / t6022-merge-rename.sh
index a1fad6980b936152d599fee8cac82610404a0673..6df2650c036cd19f16fb8f44e2b4379943af205c 100755 (executable)
@@ -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' '