diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-12-05 10:58:23 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-06 14:17:01 -0800 |
| commit | fbbccd0a10f314d9cce4427a4135efd051610880 (patch) | |
| tree | 6ec4f0f7268dedc7bfd417102e8f372599122e67 /git-mergetool.sh | |
| parent | Git 1.7.5 (diff) | |
| download | tgif-fbbccd0a10f314d9cce4427a4135efd051610880.tar.xz | |
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>
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions