merge-recursive: split out code for determining diff_filepairs
authorElijah Newren <newren@gmail.com>
Thu, 19 Apr 2018 17:58:03 +0000 (10:58 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 20 Apr 2018 01:44:15 +0000 (10:44 +0900)
commite5257b2...0d72010cea8150a520347a206394efd0
treea78db94...9b5cce455e6209c4ddb05dcfefda66bdcopy hash to clipboard (tree)
parent3992ff0...4caf925373b61aa17ab507207bf7e645copy hash to clipboard (diff)
merge-recursive.c