diff options
Diffstat (limited to 't/t3402-rebase-merge.sh')
| -rwxr-xr-x | t/t3402-rebase-merge.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/t/t3402-rebase-merge.sh b/t/t3402-rebase-merge.sh index e9e03ca4b5..761de63b6b 100755 --- a/t/t3402-rebase-merge.sh +++ b/t/t3402-rebase-merge.sh @@ -8,7 +8,6 @@ test_description='git rebase --merge test' GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME -TEST_PASSES_SANITIZE_LEAK=true . ./test-lib.sh T="A quick brown fox @@ -171,7 +170,7 @@ test_expect_success '--reapply-cherry-picks' ' # Regular rebase fails, because the 1-11 commit is deduplicated test_must_fail git -C repo rebase --merge main 2> err && - test_i18ngrep "error: could not apply.*add 12 in another branch" err && + test_grep "error: could not apply.*add 12 in another branch" err && git -C repo rebase --abort && # With --reapply-cherry-picks, it works |