Submitter | Siddharth Agarwal |
---|---|
Date | Nov. 24, 2015, 10:02 p.m. |
Message ID | <b2436682a9f6f8b56b76.1448402559@dev666.prn1.facebook.com> |
Download | mbox | patch |
Permalink | /patch/11612/ |
State | Accepted |
Delegated to: | Martin von Zweigbergk |
Headers | show |
Comments
Patch
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):