]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 3273ebc) | patch
checkout -m path: fix recreating conflicts
authorJunio C Hamano <gitster@pobox.com>
Wed, 6 Jan 2010 20:32:02 +0000 (12:32 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 6 Jan 2010 21:49:41 +0000 (13:49 -0800)
commit6d6f9acc5db0dfae94ef22c9ecbcf7df00f84399
tree9ab2abbacbbde004913e683c0d1d4644684c4b21tree | snapshot
parent3273ebc759ee44fa22026d2882d56010742c6797commit | diff
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>
builtin-checkout.c diff | blob | blame | history
t/t7201-co.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.