X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft3030-merge-recursive.sh;h=f2880152b019f4d77e3b743d7a7b02ba6d197d11;hb=cb138fede603d5b950c72b11382a28e40177a639;hp=aff360303ae2a304bff4799def6906defdb85843;hpb=5bcde3082d5f348ff8b02547126746b9b713c8d5;p=git.git

diff --git a/t/t3030-merge-recursive.sh b/t/t3030-merge-recursive.sh
index aff360303..f2880152b 100755
--- a/t/t3030-merge-recursive.sh
+++ b/t/t3030-merge-recursive.sh
@@ -269,6 +269,17 @@ test_expect_success 'merge-recursive result' '
 
 '
 
+test_expect_success 'fail if the index has unresolved entries' '
+
+	rm -fr [abcd] &&
+	git checkout -f "$c1" &&
+
+	test_must_fail git merge "$c5" &&
+	test_must_fail git merge "$c5" 2> out &&
+	grep "You are in the middle of a conflicted merge" out
+
+'
+
 test_expect_success 'merge-recursive remove conflict' '
 
 	rm -fr [abcd] &&