D932: filemerge: introduce functions to halt merge flow

[krbullock (Kevin Bullock)]

krbullock requested changes to this revision.
krbullock added a comment.
This revision now requires changes to proceed.


  I was initially confused by the description of this change, because the user can already halt (by configuration) after the first failed file merge. But this introduces a way for them to be prompted whether to halt or continue, right? Also:
  
  > These functions will be used in the next patch.
  
  What's the "next patch"? I'm not seeing it in Phabricator.

REPOSITORY
  rHG Mercurial

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

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