summaryrefslogtreecommitdiff
path: root/git-gui/po
diff options
context:
space:
mode:
authorLibravatar Elijah Newren <newren@gmail.com>2020-02-27 00:05:05 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-02-27 10:59:59 -0800
commit802050400a51270bd2b4a13e410412693975c766 (patch)
treed9e2b0722a9f17e9bc8de654065388f22c954554 /git-gui/po
parentThe seventh batch for 2.26 (diff)
downloadtgif-802050400a51270bd2b4a13e410412693975c766.tar.xz
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>
Diffstat (limited to 'git-gui/po')
0 files changed, 0 insertions, 0 deletions