| commit | 74bb46354f79e68751a59b65166fb9a53f0e2b0f | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 16 Oct 2018 07:16:00 +0000 (16 16:16 +0900) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 16 Oct 2018 07:16:00 +0000 (16 16:16 +0900) | ||
| tree | 14f659f51486887dae2486b62bb556d28151c051 | treesnapshot (tar.gz zip) |
| parent | ff6bbce6e3dd89a5852ddb657554f9209091202e | commitdiff |
| parent | d95735567550e87c8e58a92126c45f1a3875603a | commitdiff |
Merge branch 'en/merge-cleanup'
Code clean-up.
* en/merge-cleanup:
merge-recursive: rename merge_file_1() and merge_content()
merge-recursive: remove final remaining caller of merge_file_one()
merge-recursive: avoid wrapper function when unnecessary and wasteful
merge-recursive: set paths correctly when three-way merging content
Code clean-up.
* en/merge-cleanup:
merge-recursive: rename merge_file_1() and merge_content()
merge-recursive: remove final remaining caller of merge_file_one()
merge-recursive: avoid wrapper function when unnecessary and wasteful
merge-recursive: set paths correctly when three-way merging content
| merge-recursive.c | diff1 | diff2 | blobhistory |