Mercurial Mercurial > hg / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/filemerge.py
changeset 34797 284fa44f7f39
parent 34796 ed91846c29cf
child 34826 18a3274ed675 
--- 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:
Mercurial