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

[ryanmce (Ryan McElroy)]

ryanmce marked 4 inline comments as done.
ryanmce added inline comments.

INLINE COMMENTS

> yuja wrote in filemerge.py:734
> Perhaps it's better to abort here, not in _xmerge().
> 
> Several merge tools do not return non-zero status on error, so
> we have extra _check() to detect merge error.

I looked through the code and you're right -- this is a better place. This also makes this change smaller overall. Thanks for the excellent suggestion!

REPOSITORY
  rHG Mercurial

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

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