mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
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>
This commit is contained in:
parent
4393c23741
commit
8ec0dd66fa
|
@ -89,4 +89,8 @@ EOF
|
||||||
|
|
||||||
test_expect_success 'Criss-cross merge result' 'cmp file file-expect'
|
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
|
test_done
|
||||||
|
|
Loading…
Reference in a new issue