diff options
| author | Elijah Newren <newren@gmail.com> | 2019-04-05 08:00:25 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-04-08 16:02:08 +0900 |
| commit | e62d11239cad847d1c55684f6c4ba939adc8e053 (patch) | |
| tree | 53cda3ed1111f7615bb3241318ad2bfb4804f73c /builtin/commit.c | |
| parent | merge-recursive: track information associated with directory renames (diff) | |
| download | git-e62d11239cad847d1c55684f6c4ba939adc8e053.tar.gz git-e62d11239cad847d1c55684f6c4ba939adc8e053.zip | |
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>
Diffstat (limited to 'builtin/commit.c')
0 files changed, 0 insertions, 0 deletions