t6021: add a new test for git-merge-resolve
authorMiklos Vajna <vmiklos@frugalware.org>
Sat, 12 Jul 2008 18:42:10 +0000 (20:42 +0200)
committerJunio C Hamano <gitster@pobox.com>
Sun, 13 Jul 2008 20:49:10 +0000 (13:49 -0700)
commit8ec0dd66fa277615fe79ad10096d81edb263d6d1
treedfb2be9cee1cdc2c7165dda2f9d3feab899805c1
parent4393c2374101fef9053643f9b4ec638b05bd0b26
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>
t/t6021-merge-criss-cross.sh