Merge branch 'jc/unpack-trees' into next
commit5bd48f8555dc8ef4ce44142950e6abbc6b0b58d7
authorJunio C Hamano <gitster@pobox.com>
Fri, 4 Feb 2011 00:02:21 +0000 (3 16:02 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 4 Feb 2011 00:02:21 +0000 (3 16:02 -0800)
tree110ae23a052bf098e136cc298a93fefdcc78c5ee
parent8c9d4ce7ee71e3333b237212c1471f67e37eb855
parent83c90314aa27ae3768c04375d02e4f3fb12b726d
Merge branch 'jc/unpack-trees' into next

* jc/unpack-trees:
  unpack_trees(): skip trees that are the same in all input
  unpack-trees.c: cosmetic fix

Conflicts:
unpack-trees.c
unpack-trees.c