| commit | fbbccd0a10f314d9cce4427a4135efd051610880 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 5 Dec 2011 18:58:23 +0000 (5 10:58 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 6 Dec 2011 22:17:01 +0000 (6 14:17 -0800) | ||
| tree | 6ec4f0f7268dedc7bfd417102e8f372599122e67 | treesnapshot (tar.gz zip) |
| parent | ec014eac0e9e6f30cbbca616090fa2ecf74797e7 | commitdiff |
checkout -m: no need to insist on having all 3 stages
The content level merge machinery ll_merge() is prepared to merge
correctly in "both sides added differently" case by using an empty blob as
if it were the common ancestor. "checkout -m" could do the same, but didn't
bother supporting it and instead insisted on having all three stages.
Reported-by: Pete Harlan
Signed-off-by: Junio C Hamano <gitster@pobox.com>
The content level merge machinery ll_merge() is prepared to merge
correctly in "both sides added differently" case by using an empty blob as
if it were the common ancestor. "checkout -m" could do the same, but didn't
bother supporting it and instead insisted on having all three stages.
Reported-by: Pete Harlan
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin/checkout.c | diffblobblamehistory |