Junio C Hamano 3b9d69ec22 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

2014-01-10 10:33:36 -08:00

38 KiB

Raw Blame History

View Raw