Mercurial Mercurial > mercurial / 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 27124 9c870e3efab7
parent 27123 4dc5951df1e4
child 27161 296d55def9c4 
--- a/mercurial/filemerge.py	Tue Nov 24 10:57:01 2015 -0800
+++ b/mercurial/filemerge.py	Tue Nov 24 10:58:35 2015 -0800
@@ -260,7 +260,7 @@
             return _ilocal(repo, mynode, orig, fcd, fco, fca, toolconf)
     except error.ResponseExpected:
         ui.write("\n")
-        return 1, False
+        return _ifail(repo, mynode, orig, fcd, fco, fca, toolconf)
 
 @internaltool('local', nomerge)
 def _ilocal(repo, mynode, orig, fcd, fco, fca, toolconf):
mercurial