merge-recursive: Cleanup and consolidation of rename_conflict_info

diff --git a/t/t7501-commit.sh b/t/t7501-commit.sh
index a76c47419590ed16c53b8d4d82c2d92c11853154..7f7f7c7b95475b3b0673de00b68914a08098aead 100755 (executable)
--- a/t/t7501-commit.sh
+++ b/t/t7501-commit.sh
@@ -16,9 +16,10 @@ test_expect_success \
        "echo 'bongo bongo' >file &&
         git add file"
 
-test_expect_success C_LOCALE_OUTPUT \
-       "Constructing initial commit" \
-       "git status | grep 'Initial commit'"
+test_expect_success "Constructing initial commit" '
+       git status >actual &&
+       test_i18ngrep "Initial commit" actual
+'
 
 test_expect_success \
        "fail initial amend" \