merge-recursive: when comparing files, don't include trees
authorElijah Newren <newren@gmail.com>
Thu, 19 Apr 2018 17:58:09 +0000 (10:58 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 8 May 2018 07:11:00 +0000 (16:11 +0900)
commit5b047ac...7084b7b8508ea706a9950fc19709358c
treefcbf22a...5a0ce481e7012497f0f9a5495afe24a5copy hash to clipboard (tree)
parentf6f7755...1881036a3c4bfcf6737c9119c251537dcopy hash to clipboard (diff)
merge-recursive.c