git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 4393c23)
t6021: add a new test for git-merge-resolve
authorMiklos Vajna <redacted>
Sat, 12 Jul 2008 18:42:10 +0000 (20:42 +0200)
committerJunio C Hamano <redacted>
Sun, 13 Jul 2008 20:49:10 +0000 (13:49 -0700)
commit8ec0dd66fa277615fe79ad10096d81edb263d6d1
treedfb2be9cee1cdc2c7165dda2f9d3feab899805c1tree | snapshot
parent4393c2374101fef9053643f9b4ec638b05bd0b26commit | diff
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 <redacted>
Signed-off-by: Junio C Hamano <redacted>
t/t6021-merge-criss-cross.sh diff | blob | history
git clone https://git.99rst.org/PROJECT