| commit | dcf2815098589b1fa0a01e7a8459c213581d4412 | |
| author | Elijah Newren <newren@gmail.com> | |
| Thu, 8 Nov 2018 04:40:28 +0000 (7 20:40 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 8 Nov 2018 05:23:53 +0000 (8 14:23 +0900) | ||
| tree | 299e3fd79ba582cf0aaa7636e5e93f731a28dca4 | treesnapshot (tar.gz zip) |
| parent | bbafc9c44ae7109f636772350934b3c5d747da44 | commitdiff |
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>
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>
| merge-recursive.c | diffblobblamehistory |