X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft7611-merge-abort.sh;h=7b4798e8e4791c78e94da1354ef7279fa456983d;hb=a5794988dd055fa4c2d28c4d73000577970beb1e;hp=61890bc892d9fd37032f9ca05eab87de0e0dda03;hpb=38a5932be8a8f0b0bd3bb949bdc5258d9c753f15;p=git.git

diff --git a/t/t7611-merge-abort.sh b/t/t7611-merge-abort.sh
index 61890bc89..7b4798e8e 100755
--- a/t/t7611-merge-abort.sh
+++ b/t/t7611-merge-abort.sh
@@ -47,7 +47,10 @@ pre_merge_head="$(git rev-parse HEAD)"
 
 test_expect_success 'fails without MERGE_HEAD (unstarted merge)' '
 	test_must_fail git merge --abort 2>output &&
-	grep -q MERGE_HEAD output &&
+	test_i18ngrep MERGE_HEAD output
+'
+
+test_expect_success 'fails without MERGE_HEAD (unstarted merge): .git/MERGE_HEAD sanity' '
 	test ! -f .git/MERGE_HEAD &&
 	test "$pre_merge_head" = "$(git rev-parse HEAD)"
 '
@@ -58,7 +61,10 @@ test_expect_success 'fails without MERGE_HEAD (completed merge)' '
 	# Merge successfully completed
 	post_merge_head="$(git rev-parse HEAD)" &&
 	test_must_fail git merge --abort 2>output &&
-	grep -q MERGE_HEAD output &&
+	test_i18ngrep MERGE_HEAD output
+'
+
+test_expect_success 'fails without MERGE_HEAD (completed merge): .git/MERGE_HEAD sanity' '
 	test ! -f .git/MERGE_HEAD &&
 	test "$post_merge_head" = "$(git rev-parse HEAD)"
 '