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/t6029-merge-subtree.sh | |
| parent | Teach merge.log to "git-merge" again (diff) | |
| download | tgif-8ec0dd66fa277615fe79ad10096d81edb263d6d1.tar.xz | |
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/t6029-merge-subtree.sh')
0 files changed, 0 insertions, 0 deletions