From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 5 Feb 2014 22:03:01 +0000 (-0800)
Subject: Merge branch 'js/lift-parent-count-limit' into maint
X-Git-Tag: v1.8.5.4~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3c864743a68a81b5a15bbd92afcea74470c1bc2f;p=thirdparty%2Fgit.git

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
---

3c864743a68a81b5a15bbd92afcea74470c1bc2f