diff -r 4dc5951df1e4 -r 9c870e3efab7 mercurial/filemerge.py
--- 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):