![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Miklos Vajna <vmiklos@frugalware.org> | |
| Sat, 12 Jul 2008 18:42:10 +0000 (20:42 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 13 Jul 2008 20:49:10 +0000 (13:49 -0700) | ||
| commit | 8ec0dd66fa277615fe79ad10096d81edb263d6d1 | |
| tree | dfb2be9cee1cdc2c7165dda2f9d3feab899805c1 | tree | snapshot |
| parent | 4393c2374101fef9053643f9b4ec638b05bd0b26 | commit | 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 <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 | diff | blob | history |