Merge branch 'jc/combine-diff-many-parents' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 25 Feb 2013 16:03:51 +0000 (08:03 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 25 Feb 2013 16:03:51 +0000 (08:03 -0800)
commitd49f9f178b7efbe45cdd4288a9a7a6a0f023c9e3
tree41ba4a5667706e9ed03a3ada1979273bb3fe0ba6
parent66d12f97d0712b26f034fbc1ef78eefdadef2bd6
parentedbc00e76d29213010db947d8d7bff3baab12a35
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