[PATCH] t6021: add a new test for git-merge-resolve

From: Miklos Vajna <vmiklos@frugalware.org>
Date: Jul 12, 2008, 18:42 UTC
Message-ID: <1215888130-3260-1-git-send-email-vmiklos@frugalware.org>

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>
---
 t/t6021-merge-criss-cross.sh |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/t/t6021-merge-criss-cross.sh b/t/t6021-merge-criss-cross.sh
index 0ab14a6..331b9b0 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

-- 
1.5.6.2.450.g8d367.dirty