Junio C Hamano d1075adfdf Merge branch 'en/merge-path-collision' ...

Handling of conflicting renames in merge-recursive have further
been made consistent with how existing codepaths try to mimic what
is done to add/add conflicts.

* en/merge-path-collision:
  merge-recursive: apply collision handling unification to recursive case

2020-03-09 11:21:20 -07:00

116 KiB

Raw Blame History

View Raw