Skip to main content

Browse the archive

Revision 6d6f9acc5db0dfae94ef22c9ecbcf7df00f84399 authored by Junio C Hamano on 06 January 2010, 20:32:02 UTC, committed by Junio C Hamano on 06 January 2010, 21:49:41 UTC 
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>
1 parent 3273ebc
History
File Mode Size
sha1.c -rw-r--r-- 1.4 KB
sha1.h -rw-r--r-- 559 bytes
sha1ppc.S -rw-r--r-- 7.3 KB
back to top