D932: filemerge: introduce functions to halt merge flow

[durin42 (Augie Fackler)]

durin42 added a comment.


  I've landed this stack through https://phab.mercurial-scm.org/D931, will hold this one until at least Monday in case anyone objects on the style change.

INLINE COMMENTS

> ryanmce wrote in configitems.py:302
> this could be `on-failure`, per the comment on https://phab.mercurial-scm.org/D789

I'm following up on the list (with @ryanmce cc'ed) about the policy change - I dug up the email thread and it kind of trailed off without any kind of clear consensus that we should change.

FWIW, I like this style, and endorse it, I just want to make sure nobody objects before we lock it in. :)

REPOSITORY
  rHG Mercurial

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

To: ryanmce, #hg-reviewers, krbullock, mbthomas
Cc: durin42, krbullock, pulkit, mercurial-devel