combine-diff: lift 32-way limit of combined diff
authorJunio C Hamano <gitster@pobox.com>
Sun, 3 Feb 2013 21:08:18 +0000 (13:08 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 3 Feb 2013 21:08:18 +0000 (13:08 -0800)
commit776670519823b5c49ff4107dc9f77706fa37bb76
tree739f7944f279ef1fc0037c5c5cfbaecb389bc2ec
parent7e2010537e96d0a1144520222f20ba1dc3d61441
combine-diff: lift 32-way limit of combined diff

The "raw" format of combine-diff output is supposed to have as many
colons as there are parents at the beginning, then blob modes for
these parents, and then object names for these parents.

We weren't however prepared to handle a more than 32-way merge and
did not show the correct number of colons in such a case.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
combine-diff.c