This revision was automatically updated to reflect the committed changes.
Closed by commit rHGf583cef55995: merge: allow user to halt merge on merge-tool
failures (authored by ryanmce, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
ryanmce updated this revision to Diff 2502.
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D951?vs=2454=2502
REVISION DETAIL
https://phab.mercurial-scm.org/D951
AFFECTED FILES
mercurial/filemerge.py
tests/test-merge-halt.t
CHANGE DETAILS
diff --git a/tests/test-merge-halt.t
ryanmce created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Depends on https://phab.mercurial-scm.org/D932.
Call the new _onfilemergefailure function when a merge tool reports failure
via a return code.
REPOSITORY
