]> git.ipfire.org Git - thirdparty/git.git/commit - merge-recursive.c
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 6d169fd) | patch
merge-recursive: give callers of handle_content_merge() access to contents
authorElijah Newren <newren@gmail.com>
Fri, 5 Apr 2019 15:00:25 +0000 (08:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 8 Apr 2019 07:02:08 +0000 (16:02 +0900)
commite62d11239cad847d1c55684f6c4ba939adc8e053
tree53cda3ed1111f7615bb3241318ad2bfb4804f73ctree | snapshot
parent6d169fd321c0da4b20c13d08bbe19d55cab12e11commit | diff
merge-recursive: give callers of handle_content_merge() access to contents

Pass a merge_file_info struct to handle_content_merge() so that the
callers can access the oid and mode of the result afterward.

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.