diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-02-03 13:08:18 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-02-03 13:08:18 -0800 |
| commit | 776670519823b5c49ff4107dc9f77706fa37bb76 (patch) | |
| tree | 739f7944f279ef1fc0037c5c5cfbaecb389bc2ec /git-merge-octopus.sh | |
| parent | Git 1.7.12.4 (diff) | |
| download | tgif-776670519823b5c49ff4107dc9f77706fa37bb76.tar.xz | |
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>
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions