diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-03-09 11:21:20 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-03-09 11:21:20 -0700 |
| commit | d1075adfdf2d2008d665dc57b37c1f027f4ffd42 (patch) | |
| tree | 517868b34eae7b044ce1fdeb5c885f4f134e4e6f /t/chainlint/cuddled-loop.expect | |
| parent | Merge branch 'kk/complete-diff-color-moved' (diff) | |
| parent | merge-recursive: apply collision handling unification to recursive case (diff) | |
| download | tgif-d1075adfdf2d2008d665dc57b37c1f027f4ffd42.tar.xz | |
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
Diffstat (limited to 't/chainlint/cuddled-loop.expect')
0 files changed, 0 insertions, 0 deletions