merge-recursive: new function for better colliding conflict resolutions
authorElijah Newren <newren@gmail.com>
Thu, 8 Nov 2018 04:40:25 +0000 (20:40 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 8 Nov 2018 05:23:53 +0000 (14:23 +0900)
commit37b65ce...6bc8f79b5e8cf6f3addf586bd72f3352
tree2a173d6...81ee4e2ed2d1225c2d6f63f72df23b45copy hash to clipboard (tree)
parentb2a7942...8bcf397d9a5d3bb6671853755e14de60copy hash to clipboard (diff)
merge-recursive.c