Mercurial > hg
changeset 27124:9c870e3efab7
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.
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Tue, 24 Nov 2015 10:58:35 -0800 |
| parents | 4dc5951df1e4 |
| children | 969ca40cad1d |
| files | mercurial/filemerge.py |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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):