HomePhabricator

merge: allow user to halt merge on merge-tool failures

Authored by ryanmce.

Description

merge: allow user to halt merge on merge-tool failures

Depends on D932.

Call the new _onfilemergefailure function when a merge tool reports failure
via a return code.

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

Details

Committed
ryanmceOct 6 2017, 9:48 AM
Differential Revision
D951: merge: allow user to halt merge on merge-tool failures
Parents
rHGed91846c29cf: filemerge: introduce functions to halt merge flow
Branches
Unknown
Tags
Unknown