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>
Miklos Vajna committed
Jul 12, 2008 at 20:42 UTC
8ec0dd66fa277615fe79ad10096d81edb263d6d1
1 file changed
+4
t/t6021-merge-criss-cross.sh
+4
@@ -89,4 +89,8 @@ EOF
89
90
test_expect_success 'Criss-cross merge result' 'cmp file file-expect'
91
92
+test_expect_success 'Criss-cross merge fails (-s resolve)' \
93
+'git reset --hard A^ &&
94
+test_must_fail git merge -s resolve -m "final merge" B'
95
+
96
test_done