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.
--- 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):