Christian Couder <chrisc...@tuxfamily.org> writes: > Make sure we look for trailers before any conflict line > by reusing the ignore_non_trailer() function. > > Helped-by: Junio C Hamano <gits...@pobox.com> > Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> > ---
It makes sense to unify the logic to decide where the trailer block is, I would think. I however don't think I helped this change in any way, not more than "maintained the codebase as a solid foundation to build new features on", but at that point it would apply to any other change and not worth mentioning ;-). -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
