merge-recursive: apply collision handling unification to recursive case
commit802050400a51270bd2b4a13e410412693975c766
authorElijah Newren <newren@gmail.com>
Thu, 27 Feb 2020 00:05:05 +0000 (27 00:05 +0000)
committerJunio C Hamano <gitster@pobox.com>
Thu, 27 Feb 2020 18:59:59 +0000 (27 10:59 -0800)
treed9e2b0722a9f17e9bc8de654065388f22c954554
parent2d2118b814c11f509e1aa76cb07110f7231668dc
merge-recursive: apply collision handling unification to recursive case

In the en/merge-path-collision topic (see commit ac193e0e0aa5, "Merge
branch 'en/merge-path-collision'", 2019-01-04), all the "file collision"
conflict types were modified for consistency.  In particular,
rename/add, rename/rename(2to1) and each rename/add piece of a
rename/rename(1to2)/add[/add] conflict were made to behave like add/add
conflicts have always been handled.

However, this consistency was not enforced when opt->priv->call_depth >
0 for rename/rename conflicts.  Update rename/rename(1to2) and
rename/rename(2to1) conflicts in the recursive case to also be
consistent.  As an added bonus, this simplifies the code considerably.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
merge-recursive.c
t/t6036-recursive-corner-cases.sh