merge-recursive: make !o->detect_rename codepath more obvious
authorElijah Newren <newren@gmail.com>
Wed, 14 Feb 2018 18:51:52 +0000 (10:51 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 14 Feb 2018 21:02:52 +0000 (13:02 -0800)
commite7f04a3...afe3fa9bc911e3a71e03e9e7cc8b18ba
tree62a7df1...ab31b0fcefbad7f1f1c94612504cef69copy hash to clipboard (tree)
parent9622f8a...8c337f097661a0f476de5b665d74b853copy hash to clipboard (diff)
merge-recursive.c