summaryrefslogtreecommitdiff
path: root/Documentation/howto/rebuild-from-update-hook.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-01-06 12:32:02 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-01-06 13:49:41 -0800
commit6d6f9acc5db0dfae94ef22c9ecbcf7df00f84399 (patch)
tree9ab2abbacbbde004913e683c0d1d4644684c4b21 /Documentation/howto/rebuild-from-update-hook.txt
parentGIT 1.6.1-rc1 (diff)
downloadtgif-6d6f9acc5db0dfae94ef22c9ecbcf7df00f84399.tar.xz
checkout -m path: fix recreating conflicts
We should tell ll_merge() that the 3-way merge between stages #2 and #3 is an outermost merge, not a virtual-ancestor creation. Back when this code was originally written, users couldn't write custom merge drivers easily, so the bug didn't matter, but these days it does. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/howto/rebuild-from-update-hook.txt')
0 files changed, 0 insertions, 0 deletions