D932: filemerge: introduce functions to halt merge flow

[pulkit (Pulkit Goyal)]

pulkit added inline comments.

INLINE COMMENTS

> config.txt:1248
> +   or halt the merge process. Setting this to ``halt`` will automatically
> +   half the merge process on any merge tool failure. The merge process
> +   can be restarted by using the ``resolve`` command. When a merge is

typo, s/half/halt

REPOSITORY
  rHG Mercurial

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

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