Mercurial > public > mercurial-scm > hg-stable
diff mercurial/filemerge.py @ 26967:7a8e9a985c3b
filemerge: remove leading space from " no tool found..."
I could not find or see a reason for the unusual formatting. The lines
following it in the test cases are not indented.
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Wed, 11 Nov 2015 10:19:11 -0800 |
| parents | 067ab07435c9 |
| children | 7b038ec6c5fd |
line wrap: on
line diff
--- a/mercurial/filemerge.py Mon Nov 09 22:31:01 2015 +0900 +++ b/mercurial/filemerge.py Wed Nov 11 10:19:11 2015 -0800 @@ -177,7 +177,7 @@ fd = fcd.path() try: - index = ui.promptchoice(_(" no tool found to merge %s\n" + index = ui.promptchoice(_("no tool found to merge %s\n" "keep (l)ocal or take (o)ther?" "$$ &Local $$ &Other") % fd, 0) choice = ['local', 'other'][index]