git-sh-i18n--envsubst: our own envsubst(1) for eval_gettext()

diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index b147a1bd69e96e48d3808028a3775a609471639a..e84e822219a45cca3478f50a05756be359b43393 100755 (executable)
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
@@ -498,7 +498,7 @@ test_debug 'git log --graph --decorate --oneline --all'
 test_expect_success 'in-index merge' '
        git reset --hard c0 &&
        git merge --no-ff -s resolve c1 >out &&
-       grep "Wonderful." out &&
+       test_i18ngrep "Wonderful." out &&
        verify_parents $c0 $c1
 '