D789: merge: add option to abort merge process on failure

[mbthomas (Mark Thomas)]

mbthomas requested changes to this revision.
mbthomas added inline comments.

INLINE COMMENTS

> filemerge.py:537
> +        def onerr(*args):
> +            msg = _('merge aborted due to nonrzero mergetool return code')
> +            raise error.Abort(msg)

Typo: `nonrzero`.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D789

To: ryanmce, #hg-reviewers, quark, yuja, mbthomas
Cc: mbthomas, yuja, quark, mercurial-devel