From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 16 Oct 2018 07:16:00 +0000 (+0900)
Subject: Merge branch 'en/merge-cleanup'
X-Git-Tag: v2.20.0-rc0~187
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=74bb46354f79e68751a59b65166fb9a53f0e2b0f;p=git

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

74bb46354f79e68751a59b65166fb9a53f0e2b0f