From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 25 Feb 2013 16:03:51 +0000 (-0800)
Subject: Merge branch 'jc/combine-diff-many-parents' into maint
X-Git-Tag: v1.8.2-rc1~2^2~9
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d49f9f178b7efbe45cdd4288a9a7a6a0f023c9e3;p=git

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
---

d49f9f178b7efbe45cdd4288a9a7a6a0f023c9e3