merge-recursive: Fix sorting order and directory change assumptions

diff --git a/t/t7811-grep-open.sh b/t/t7811-grep-open.sh
index 568a6f2b69ab5003c00f206806c3fe6289f63a98..a8957782cfb8fae4b7c171d4c9db24ce6cd5505e 100755 (executable)
--- a/t/t7811-grep-open.sh
+++ b/t/t7811-grep-open.sh
@@ -63,7 +63,7 @@ test_expect_success SIMPLEPAGER 'git grep -O' '
 
 test_expect_success 'git grep -O --cached' '
        test_must_fail git grep --cached -O GREP_PATTERN >out 2>msg &&
-       grep open-files-in-pager msg
+       test_i18ngrep open-files-in-pager msg
 '
 
 test_expect_success 'git grep -O --no-index' '