| commit | 0c4918d1c1722c1faaa909f3f8486d5a0d816538 | |
| author | Elijah Newren <newren@gmail.com> | |
| Mon, 20 Sep 2010 08:28:52 +0000 (20 02:28 -0600) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 30 Sep 2010 00:32:38 +0000 (29 17:32 -0700) | ||
| tree | 2ada830770b287fb072ca9277ccfab9d31545946 | treesnapshot (tar.gz zip) |
| parent | 5e3ce663b03bf14443ef8b4c60b407664f97040b | commitdiff |
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>
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>
| merge-recursive.c | diffblobblamehistory |