Andrew's git / gitweb.git / diff
?
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)
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>
No differences found