diff options
| author |  Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2008-06-27 13:24:47 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-06-27 23:36:59 -0700 |
| commit | ef98c5cafb3e799b1568bb843fcd45920dc62f16 (patch) | |
| tree | 03fd2a123435f4eaec1f2cbaecba27db4d317ba4 /diffcore.h | |
| parent | shrink git-shell by avoiding redundant dependencies (diff) | |
| download | tgif-ef98c5cafb3e799b1568bb843fcd45920dc62f16.tar.xz | |
commit-tree: lift completely arbitrary limit of 16 parents
There is no really good reason to have a merge with more than 16
parents, but we have a history of giving our users rope.
Combined with the fact that there was no good reason for that
arbitrary limit in the first place, here is an all-too-easy to fix.
Kind of wished-for by Len Brown.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diffcore.h')
0 files changed, 0 insertions, 0 deletions