projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 0b30e81) | patch
merge-recursive: Fix recursive case with D/F conflict via add/add conflict
authorElijah Newren <newren@gmail.com>
Fri, 12 Aug 2011 05:19:55 +0000 (23:19 -0600)
committerJunio C Hamano <gitster@pobox.com>
Sun, 14 Aug 2011 21:19:34 +0000 (14:19 -0700)
commit7b1c610f84a46fa237627b3307707afb520e555c
tree3487f1b4b6f8cf255dd934e22d1590eaef3435b9tree | snapshot
parent0b30e8125130a78bc7c0e13e7f45ba105bd206b8commit | diff
merge-recursive: Fix recursive case with D/F conflict via add/add conflict

When a D/F conflict is introduced via an add/add conflict, when
o->call_depth > 0 we need to ensure that the higher stage entry from the
base stage is removed.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
merge-recursive.c diff | blob | history
t/t6036-recursive-corner-cases.sh diff | blob | history
Git—the stupid content tracker