From: Elijah Newren <newren@gmail.com>
Date: Fri, 5 Apr 2019 15:00:25 +0000 (-0700)
Subject: merge-recursive: give callers of handle_content_merge() access to contents
X-Git-Tag: v2.22.0-rc0~34^2~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e62d11239cad847d1c55684f6c4ba939adc8e053?ds=inline;hp=e62d11239cad847d1c55684f6c4ba939adc8e053

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>
---