diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-01-10 10:33:36 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-01-10 10:33:36 -0800 |
| commit | 3b9d69ec22b8821fecc44c07ea49adc749484335 (patch) | |
| tree | 89993616989d8d5a43cbcf5a39ac651c70a2272f /diff.c | |
| parent | f0f493ec58489c739839e8d257a04159889639c6 (diff) | |
| parent | e228c1736f25c59cd6da51ed97e03ecd80a935e6 (diff) | |
| download | git-3b9d69ec22b8821fecc44c07ea49adc749484335.tar.gz git-3b9d69ec22b8821fecc44c07ea49adc749484335.tar.xz | |
Merge branch 'js/lift-parent-count-limit'
There is no reason to have a hardcoded upper limit of the number of
parents for an octopus merge, created via the graft mechanism.
* js/lift-parent-count-limit:
Remove the line length limit for graft files
Diffstat (limited to 'diff.c')
0 files changed, 0 insertions, 0 deletions