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

Junio C Hamano committed Jan 10, 2014 at 10:33 UTC 3b9d69ec22b8821fecc44c07ea49adc749484335

No changes.