Revert "unpack_trees(): skip trees that are the same in all input"
authorJunio C Hamano <gitster@pobox.com>
Tue, 15 Feb 2011 18:47:04 +0000 (10:47 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 15 Feb 2011 18:47:04 +0000 (10:47 -0800)
commit4e363b11bdc3770efcfe55dac79f6dc18a5e562b
tree26a0d3b8e23a1f763bb15090e4c98b8ed5073456
parent3952710bfaa46917fd0c3a9b29d076ec013d6b6a
Revert "unpack_trees(): skip trees that are the same in all input"

This reverts commit 83c90314aa27ae3768c04375d02e4f3fb12b726d, which
seems to have broken merge to report conflicts when there should be
none.
unpack-trees.c