# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 2015-11-24 18:58:35
# Node ID 9c870e3efab701ad8c19c336731d3bca58c80e91
# Parent  4dc5951df1e4c813782ccd534f0d9791893b293f

filemerge: in ':prompt', use ':fail' tool rather than returning directly

The ':fail' tool now knows to write out the changed side for change/delete
conflicts.

This has no impact right now but will make things better when we move
change/delete conflicts in here.

diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py
--- a/mercurial/filemerge.py
+++ b/mercurial/filemerge.py
@@ -260,7 +260,7 @@ def _iprompt(repo, mynode, orig, fcd, fc
             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):