From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 8 Feb 2013 23:29:07 +0000 (-0800)
Subject: Merge branch 'jc/combine-diff-many-parents'
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4dd7c77d19d42f6981ba4cdcda91755e5587cc28;p=git.git

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

We used to have an arbitrary 32 limit for combined diff input,
resulting in incorrect number of leading colons shown when showing
the "--raw --cc" output.

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

4dd7c77d19d42f6981ba4cdcda91755e5587cc28