merge-recursive: remove final remaining caller of merge_file_one()
authorElijah Newren <newren@gmail.com>
Wed, 19 Sep 2018 16:14:33 +0000 (09:14 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 20 Sep 2018 19:33:57 +0000 (12:33 -0700)
commit0270a07...d0b22734920fb92f58052b213c2f9bc8
tree3459e96...149bf36eee78b835d2381d791e99a9fecopy hash to clipboard (tree)
parent75f3fa7...c39a39fd6ca5e4bae73df4073ca97bd4copy hash to clipboard (diff)
merge-recursive.c