diff options
| author |  Elijah Newren <newren@gmail.com> | 2018-11-07 20:40:28 -0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-11-08 14:23:53 +0900 |
| commit | dcf2815098589b1fa0a01e7a8459c213581d4412 (patch) | |
| tree | 299e3fd79ba582cf0aaa7636e5e93f731a28dca4 /contrib | |
| parent | merge-recursive: improve handling for rename/rename(2to1) conflicts (diff) | |
| download | tgif-dcf2815098589b1fa0a01e7a8459c213581d4412.tar.xz | |
merge-recursive: use handle_file_collision for add/add conflicts
This results in no-net change of behavior, it simply ensures that all
file-collision conflict handling types are being handled the same by
calling the same function.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib')
0 files changed, 0 insertions, 0 deletions