merge-recursive: rename merge_file_1() and merge_content()
commitd95735567550e87c8e58a92126c45f1a3875603a
authorElijah Newren <newren@gmail.com>
Wed, 19 Sep 2018 16:14:34 +0000 (19 09:14 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 20 Sep 2018 19:33:57 +0000 (20 12:33 -0700)
tree5a5d5c4f267331c8e2a5c0ed91b085469da4948f
parent0270a07ad0b22734920fb92f58052b213c2f9bc8
merge-recursive: rename merge_file_1() and merge_content()

Summary:
  merge_file_1()  -> merge_mode_and_contents()
  merge_content() -> handle_content_merge()

merge_file_1() is a very unhelpful name.  Rename it to
merge_mode_and_contents() to reflect what it does.

merge_content() calls merge_mode_and_contents() to do the main part of
its work, but most of this function was about higher level stuff, e.g.
printing out conflict messages, updating skip_worktree bits, checking
for ability to avoid updating the working tree or for D/F conflicts
being in the way, etc.  Since there are several handle_*() functions for
similar levels of checking and handling in merge-recursive.c (e.g.
handle_change_delete(), handle_rename_rename_2to1()), let's rename this
function to handle_content_merge().

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
merge-recursive.c