]> git.ipfire.org Git - thirdparty/git.git/commit - merge-recursive.c
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: bbafc9c) | patch
merge-recursive: use handle_file_collision for add/add conflicts
authorElijah Newren <newren@gmail.com>
Thu, 8 Nov 2018 04:40:28 +0000 (20:40 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 8 Nov 2018 05:23:53 +0000 (14:23 +0900)
commitdcf2815098589b1fa0a01e7a8459c213581d4412
tree299e3fd79ba582cf0aaa7636e5e93f731a28dca4tree | snapshot
parentbbafc9c44ae7109f636772350934b3c5d747da44commit | diff
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>
merge-recursive.c diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.