From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 10 Jan 2014 18:33:36 +0000 (-0800)
Subject: Merge branch 'js/lift-parent-count-limit'
X-Git-Tag: v1.9-rc0~22
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3b9d69ec22b8821fecc44c07ea49adc749484335?ds=inline;hp=--cc

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

3b9d69ec22b8821fecc44c07ea49adc749484335