[PATCH STABLE] amend: abort if unresolved merge conflicts found (issue5805)

[Augie Fackler]

On Sun, Mar 11, 2018 at 08:16:19PM +0900, Yuya Nishihara wrote:
> # HG changeset patch
> # User Yuya Nishihara <yuya at tcha.org>
> # Date 1520766638 -32400
> #      Sun Mar 11 20:10:38 2018 +0900
> # Branch stable
> # Node ID eeb87b24aea7f547f6d95b812dd080dc6e9ab194
> # Parent  9639c433be54191b4136b48fe70fc8344d2b5db2
> amend: abort if unresolved merge conflicts found (issue5805)

queued, thanks