diff options
| author | Miklos Vajna <vmiklos@frugalware.org> | 2008-07-12 20:42:10 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-13 13:49:10 -0700 |
| commit | 8ec0dd66fa277615fe79ad10096d81edb263d6d1 (patch) | |
| tree | dfb2be9cee1cdc2c7165dda2f9d3feab899805c1 /t/t6021-merge-criss-cross.sh | |
| parent | 4393c2374101fef9053643f9b4ec638b05bd0b26 (diff) | |
| download | git-8ec0dd66fa277615fe79ad10096d81edb263d6d1.tar.gz | |
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>
Diffstat (limited to 't/t6021-merge-criss-cross.sh')
| -rwxr-xr-x | 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 0ab14a6e81..331b9b07d4 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 |