diff options
| author |  Elijah Newren <newren@gmail.com> | 2010-09-20 02:28:52 -0600 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-09-29 17:32:38 -0700 |
| commit | 0c4918d1c1722c1faaa909f3f8486d5a0d816538 (patch) | |
| tree | 2ada830770b287fb072ca9277ccfab9d31545946 /Documentation/manpage-normal.xsl | |
| parent | merge-recursive: Move delete/modify handling into dedicated function (diff) | |
| download | tgif-0c4918d1c1722c1faaa909f3f8486d5a0d816538.tar.xz | |
merge-recursive: Move process_entry's content merging into a function
This move is in preparation for merge_content growing and being called from
multiple places in order to handle D/F conflicts.
I also snuck in a small change to the output in the case that the merged
content for the file matches the current file contents, to make it better
match (and thus more able to take over) how other merge_file() calls in
process_renames() are handled.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/manpage-normal.xsl')
0 files changed, 0 insertions, 0 deletions