merge-recursive: when comparing files, don't include trees
authorElijah Newren <newren@gmail.com>
Wed, 14 Feb 2018 18:51:59 +0000 (10:51 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 14 Feb 2018 21:02:53 +0000 (13:02 -0800)
commit7d38849...b77b0d62a283eb2903ababf6c33673dd
tree57ec629...23e0aece00bc1bb2f51c4699ad3c48cacopy hash to clipboard (tree)
parent79d49b7...8c75b80d5aeaf9d84895361b85e9c748copy hash to clipboard (diff)
merge-recursive.c