Re: [PATCH 4/4] merge-recursive: rename merge_file_1() and merge_content()

2018-09-19 Thread Stefan Beller
On Wed, Sep 19, 2018 at 9:15 AM Elijah Newren wrote: > > 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()

[PATCH 4/4] merge-recursive: rename merge_file_1() and merge_content()

2018-09-19 Thread Elijah Newren
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