merge-recursive: rename conflict_rename_*() family of functions
authorElijah Newren <newren@gmail.com>
Sun, 10 Jun 2018 04:16:15 +0000 (21:16 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 12 Jun 2018 17:22:57 +0000 (10:22 -0700)
commit8ebe7b0...7ad866e027365526782cd2e42a0bd106
treeba7b36b...2f325e11911ad3a453aa02fed702e667copy hash to clipboard (tree)
parent5455c33...39c6c5d248007ad2b49e8a225e9f47facopy hash to clipboard (diff)
merge-recursive.c