Merge branch 'jc/combine-diff-many-parents' into maint

* jc/combine-diff-many-parents: t4038: add tests for "diff --cc --raw <trees>" combine-diff: lift 32-way limit of combined diff

Junio C Hamano committed Feb 25, 2013 at 08:03 UTC d49f9f178b7efbe45cdd4288a9a7a6a0f023c9e3

No changes.