| commit | 3c864743a68a81b5a15bbd92afcea74470c1bc2f | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 5 Feb 2014 22:03:01 +0000 (5 14:03 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 5 Feb 2014 22:03:01 +0000 (5 14:03 -0800) | ||
| tree | c36b51250e9ca8a6d55a77a10d297a8090477a91 | treesnapshot (tar.gz zip) |
| parent | ee5788e306a69933eeb5472e68fd6c4c7105d9ef | commitdiff |
| parent | e228c1736f25c59cd6da51ed97e03ecd80a935e6 | commitdiff |
Merge branch 'js/lift-parent-count-limit' into maint
There is no reason to have a hardcoded upper limit of the number of
parents for an octopus merge, created via the graft mechanism, but
there was.
* js/lift-parent-count-limit:
Remove the line length limit for graft files
There is no reason to have a hardcoded upper limit of the number of
parents for an octopus merge, created via the graft mechanism, but
there was.
* js/lift-parent-count-limit:
Remove the line length limit for graft files