From: Elijah Newren <newren@gmail.com>
Date: Wed, 19 Sep 2018 16:14:32 +0000 (-0700)
Subject: merge-recursive: avoid wrapper function when unnecessary and wasteful
X-Git-Tag: v2.20.0-rc0~187^2~2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/75f3fa79c39a39fd6ca5e4bae73df4073ca97bd4?ds=inline;hp=75f3fa79c39a39fd6ca5e4bae73df4073ca97bd4

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>
---