D932: filemerge: introduce functions to halt merge flow

[ryanmce (Ryan McElroy)]

ryanmce added a comment.


  > I was initially confused by the description of this change, because the user can already halt (by configuration) after the first failed file merge.
  
  As far as I know, this is simply not true. I know of no way in mercurial, before this series, to halt a merge after the first failed file merge. If it's already there, I'm happy to be informed of it and drop this series.
  
  > But this introduces a way for them to be prompted whether to halt or continue, right?
  
  It introduces the first way that I'm aware of to halt a merge after a failed file merge. It also gives an option to prompt which also didn't exist before.
  
  > Also: What's the "next patch"? I'm not seeing it in Phabricator.
  
  I had my internet connection at the airport interrupted and was only now able to finish sending the series. Sorry about that.

INLINE COMMENTS

> pulkit wrote in config.txt:1248
> typo, s/half/halt

Will fix.

REPOSITORY
  rHG Mercurial

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

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