D932: filemerge: introduce functions to halt merge flow

[martinvonz (Martin von Zweigbergk)]

martinvonz added inline comments.

INLINE COMMENTS

> filemerge.py:755-756
> +    if action == 'prompt':
> +        msg = _('continue merge operation (yn)?' '$$ &Yes $$ &No')
> +        if ui.promptchoice(msg, 0) == 1:
> +            _haltmerge()

nit: Is the default used only with non-interactive ui? If it also works as a default that lets the user just press enter to choose Yes, I'd expect the "yn" to be "Yn"

REPOSITORY
  rHG Mercurial

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

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