Merge branch 'mk/doc-gitfile-more' into maint-2.43

[thirdparty/git.git] / t / t3320-notes-merge-worktrees.sh

diff --git a/t/t3320-notes-merge-worktrees.sh b/t/t3320-notes-merge-worktrees.sh
index bff0aea550f285a6c2073efd50182cbc5fab8656..0fd33280cf91f7fe9384205df8b7570363a37076 100755 (executable)
--- a/t/t3320-notes-merge-worktrees.sh
+++ b/t/t3320-notes-merge-worktrees.sh
@@ -57,7 +57,7 @@ test_expect_success 'merge z into y while mid-merge in another workdir fails' '
                cd worktree &&
                git config core.notesRef refs/notes/y &&
                test_must_fail git notes merge z 2>err &&
-               test_i18ngrep "a notes merge into refs/notes/y is already in-progress at" err
+               test_grep "a notes merge into refs/notes/y is already in-progress at" err
        ) &&
        test_must_fail git -C worktree symbolic-ref NOTES_MERGE_REF
 '
@@ -67,7 +67,7 @@ test_expect_success 'merge z into x while mid-merge on y succeeds' '
                cd worktree2 &&
                git config core.notesRef refs/notes/x &&
                test_must_fail git notes merge z >out 2>&1 &&
-               test_i18ngrep "Automatic notes merge failed" out &&
+               test_grep "Automatic notes merge failed" out &&
                grep -v "A notes merge into refs/notes/x is already in-progress in" out
        ) &&
        echo "refs/notes/x" >expect &&