merge-recursive: rename merge_file_1() and merge_content()
authorElijah Newren <newren@gmail.com>
Wed, 19 Sep 2018 16:14:34 +0000 (09:14 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 20 Sep 2018 19:33:57 +0000 (12:33 -0700)
commitd957355...7550e87c8e58a92126c45f1a3875603a
tree5a5d5c4...267331c8e2a5c0ed91b085469da4948fcopy hash to clipboard (tree)
parent0270a07...d0b22734920fb92f58052b213c2f9bc8copy hash to clipboard (diff)
merge-recursive.c