filemerge: introduce functions to halt merge flow

Authored by ryanmce.

Description

filemerge: introduce functions to halt merge flow

Depends on D931.

This patch introduces functions and a config option that will allow a user
to halt the merge if there are failures during a file merge. These functions
will be used in the next patch.

Differential Revision: https://phab.mercurial-scm.org/D932

Details

Committed
ryanmceOct 6 2017, 9:48 AM
Differential Revision
D932: filemerge: introduce functions to halt merge flow
Parents
rHG530b7361e3a9: amend: add a flag `-n/--note` to store note with amend
Branches
Unknown
Tags
Unknown