git.99rst.org / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ee5788e e228c17)
Merge branch 'js/lift-parent-count-limit' into maint
authorJunio C Hamano <redacted>
Wed, 5 Feb 2014 22:03:01 +0000 (14:03 -0800)
committerJunio C Hamano <redacted>
Wed, 5 Feb 2014 22:03:01 +0000 (14:03 -0800)
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


Trivial merge
git clone https://git.99rst.org/PROJECT