X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft3030-merge-recursive.sh;h=9b3fa2bdcd9bebae46a000ffe9c2059cea5a93fd;hb=08ac69685a5b6bea45df1fd62ea1d9b7c0258d0b;hp=0de613dc53d85c01f6d122834e094503a2736507;hpb=0e1aa2f7af6cc11c56a780764ef0ca94c19f0724;p=git.git

diff --git a/t/t3030-merge-recursive.sh b/t/t3030-merge-recursive.sh
index 0de613dc5..9b3fa2bdc 100755
--- a/t/t3030-merge-recursive.sh
+++ b/t/t3030-merge-recursive.sh
@@ -276,6 +276,9 @@ test_expect_success 'fail if the index has unresolved entries' '
 
 	test_must_fail git merge "$c5" &&
 	test_must_fail git merge "$c5" 2> out &&
+	grep "You have not concluded your merge" out &&
+	rm -f .git/MERGE_HEAD &&
+	test_must_fail git merge "$c5" 2> out &&
 	grep "You are in the middle of a conflicted merge" out
 
 '