Merge branch 'jc/unpack-trees'
authorJunio C Hamano <gitster@pobox.com>
Thu, 10 Feb 2011 00:41:17 +0000 (16:41 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 10 Feb 2011 00:41:17 +0000 (16:41 -0800)
commit75513914784bb75447c71e3b001612ee37af386c
treee48b5eb46dbb4a5b10cb795ca50491d69000455f
parent7fb9ec2123e8f57a22fa4b61200e5cdf7c1eb094
parent83c90314aa27ae3768c04375d02e4f3fb12b726d
Merge branch 'jc/unpack-trees'

* 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