[PATCH STABLE] annotate: do not poorly split lines at CR (issue5798)

[Augie Fackler]

> On Feb 21, 2018, at 07:49, Yuya Nishihara <yuya at tcha.org> wrote:
> 
> # HG changeset patch
> # User Yuya Nishihara <yuya at tcha.org>
> # Date 1519215245 -32400
> #      Wed Feb 21 21:14:05 2018 +0900
> # Branch stable
> # Node ID 24b17a714a92c8fe860db5f6d0d49c23293deec6
> # Parent  c19e66dacaa184feba31136c18a369ba995ddfe4
> annotate: do not poorly split lines at CR (issue5798)

queued, thanks