From: Miklos Vajna <vmiklos@frugalware.org>
Date: Sat, 12 Jul 2008 18:42:10 +0000 (+0200)
Subject: t6021: add a new test for git-merge-resolve
X-Git-Tag: v1.6.0-rc0~51^2~3
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8ec0dd66fa277615fe79ad10096d81edb263d6d1;p=git.git

t6021: add a new test for git-merge-resolve

It should fail properly if there are multiple merge bases, but there
were no test for this till now.

Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/t/t6021-merge-criss-cross.sh b/t/t6021-merge-criss-cross.sh
index 0ab14a6e8..331b9b07d 100755
--- a/t/t6021-merge-criss-cross.sh
+++ b/t/t6021-merge-criss-cross.sh
@@ -89,4 +89,8 @@ EOF
 
 test_expect_success 'Criss-cross merge result' 'cmp file file-expect'
 
+test_expect_success 'Criss-cross merge fails (-s resolve)' \
+'git reset --hard A^ &&
+test_must_fail git merge -s resolve -m "final merge" B'
+
 test_done