diff options
Diffstat (limited to 't/t2030-unresolve-info.sh')
| -rwxr-xr-x | t/t2030-unresolve-info.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t2030-unresolve-info.sh b/t/t2030-unresolve-info.sh index 3eda385ca2..be3fcdde07 100755 --- a/t/t2030-unresolve-info.sh +++ b/t/t2030-unresolve-info.sh @@ -228,7 +228,7 @@ test_expect_success 'rerere forget (add-add conflict)' ' git commit -m "add differently" && test_must_fail git merge fifth && git rerere forget add-differently 2>actual && - test_i18ngrep "no remembered" actual + test_grep "no remembered" actual ' test_expect_success 'resolve-undo keeps blobs from gc' ' |