t6422, t6426: be more flexible for add/add conflicts involving renames

[thirdparty/git.git] / t / t6426-merge-skip-unneeded-updates.sh

diff --git a/t/t6426-merge-skip-unneeded-updates.sh b/t/t6426-merge-skip-unneeded-updates.sh
index 5a2d07e5164364dfaf63b85a1e9000fbfc1d6e98..699813671c8c1fb5e1624c46415b44711d44a89f 100755 (executable)
--- a/t/t6426-merge-skip-unneeded-updates.sh
+++ b/t/t6426-merge-skip-unneeded-updates.sh
@@ -374,7 +374,7 @@ test_expect_success '2c: Modify b & add c VS rename b->c' '
                export GIT_MERGE_VERBOSITY &&
                test_must_fail git merge -s recursive B^0 >out 2>err &&
 
-               test_i18ngrep "CONFLICT (rename/add): Rename b->c" out &&
+               test_i18ngrep "CONFLICT (.*/add):" out &&
                test_must_be_empty err &&
 
                # Make sure c WAS updated