diff options
| author |  Elijah Newren <newren@gmail.com> | 2018-09-19 09:14:32 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-09-20 12:33:57 -0700 |
| commit | 75f3fa79c39a39fd6ca5e4bae73df4073ca97bd4 (patch) | |
| tree | f36ac38593ad7c773f047928c9777eaa3869e82a /userdiff.c | |
| parent | merge-recursive: set paths correctly when three-way merging content (diff) | |
| download | tgif-75f3fa79c39a39fd6ca5e4bae73df4073ca97bd4.tar.xz | |
merge-recursive: avoid wrapper function when unnecessary and wasteful
merge_file_one() is a convenience function taking a bunch of oids and
modes, combining each pair into a diff_filespec, and then calling
merge_file_1(). When we already start with diff_filespec's, we can
just call merge_file_1() directly instead of splitting out the oids
and modes for the wrapper to recombine into what we already had.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'userdiff.c')
0 files changed, 0 insertions, 0 deletions