merge-recursive: split out code for determining diff_filepairs
authorElijah Newren <newren@gmail.com>
Wed, 14 Feb 2018 18:51:53 +0000 (10:51 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 14 Feb 2018 21:02:52 +0000 (13:02 -0800)
commit3f64687...a31d95576e11e74fc5db2e3ed2380b52
tree951c273...ac485d224761ea6805d6137a30c517e0copy hash to clipboard (tree)
parente7f04a3...afe3fa9bc911e3a71e03e9e7cc8b18bacopy hash to clipboard (diff)
merge-recursive.c