X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft4151-am-abort.sh;h=1176bcccf3b3f3708df04f49bfd084190cd27600;hb=0e1cfc52de002e2d9b0e6562e8672fee3bf45a67;hp=c95c4ccc393d0863ad53b6a2a684893282d7d9e6;hpb=43176d1e4cddc4ab2f2f7dc6f3ba10513ffc2f2b;p=git.git diff --git a/t/t4151-am-abort.sh b/t/t4151-am-abort.sh index c95c4ccc3..1176bcccf 100755 --- a/t/t4151-am-abort.sh +++ b/t/t4151-am-abort.sh @@ -45,8 +45,9 @@ do test_expect_success "am$with3 --skip continue after failed am$with3" ' test_must_fail git am$with3 --skip >output && - test "$(grep "^Applying" output)" = "Applying: 6" && - test_cmp file-2-expect file-2 && + test_i18ngrep "^Applying" output >output.applying && + test_i18ngrep "^Applying: 6$" output.applying && + test_i18ncmp file-2-expect file-2 && test ! -f .git/MERGE_RR '