diff options
| author | Elijah Newren <newren@gmail.com> | 2011-08-11 23:19:55 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-14 14:19:34 -0700 |
| commit | 7b1c610f84a46fa237627b3307707afb520e555c (patch) | |
| tree | 3487f1b4b6f8cf255dd934e22d1590eaef3435b9 /abspath.c | |
| parent | 0b30e8125130a78bc7c0e13e7f45ba105bd206b8 (diff) | |
| download | git-7b1c610f84a46fa237627b3307707afb520e555c.tar.gz git-7b1c610f84a46fa237627b3307707afb520e555c.tar.xz | |
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>
Diffstat (limited to 'abspath.c')
0 files changed, 0 insertions, 0 deletions