D932: filemerge: introduce functions to halt merge flow

[krbullock (Kevin Bullock)]

krbullock added a subscriber: yuja.
krbullock added inline comments.

INLINE COMMENTS

> ryanmce wrote in filemerge.py:755-756
> I followed the pattern seen elsewhere in this file.
> 
> If you just hit enter, you do get the default, though.
> 
> I can follow-up with a patch to fix all of these unclear prompts if there are no objections... (after the freeze of course)

I think fixes to unclear prompts are acceptable during the freeze. @martinvonz @durin42 @yuja what do y'all think?

REPOSITORY
  rHG Mercurial

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

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