Mercurial > public > mercurial-scm > hg-stable

diff mercurial/filemerge.py @ 34797:284fa44f7f39

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
author Ryan McElroy <rmcelroy@fb.com>
date Fri, 06 Oct 2017 06:48:43 -0700
parents ed91846c29cf
children 18a3274ed675
line wrap: on
line diff
--- a/mercurial/filemerge.py	Fri Oct 06 06:48:43 2017 -0700
+++ b/mercurial/filemerge.py	Fri Oct 06 06:48:43 2017 -0700
@@ -739,6 +739,7 @@
         if r:
             if onfailure:
                 ui.warn(onfailure % fd)
+            _onfilemergefailure(ui)
 
         return True, r, deleted
     finally: