merge-recursive: make "CONFLICT (rename/delete)" message show both paths

diff --git a/t/t7411-submodule-config.sh b/t/t7411-submodule-config.sh
index 400e2b1439a9e7fa329f78b8c5d600f34cf375d2..47562ce4654db9d763cdf0c6d6b91724489110ff 100755 (executable)
--- a/t/t7411-submodule-config.sh
+++ b/t/t7411-submodule-config.sh
@@ -89,7 +89,7 @@ test_expect_success 'error message contains blob reference' '
                        HEAD b \
                        HEAD submodule \
                                2>actual_err &&
-               grep "submodule-blob $sha1:.gitmodules" actual_err >/dev/null
+               test_i18ngrep "submodule-blob $sha1:.gitmodules" actual_err >/dev/null
        )
 '