Mercurial > public > mercurial-scm > hg
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 26966:51fa43a3cd58 | 26967:7a8e9a985c3b |
|---|---|
| 175 the merged version.""" | 175 the merged version.""" |
| 176 ui = repo.ui | 176 ui = repo.ui |
| 177 fd = fcd.path() | 177 fd = fcd.path() |
| 178 | 178 |
| 179 try: | 179 try: |
| 180 index = ui.promptchoice(_(" no tool found to merge %s\n" | 180 index = ui.promptchoice(_("no tool found to merge %s\n" |
| 181 "keep (l)ocal or take (o)ther?" | 181 "keep (l)ocal or take (o)ther?" |
| 182 "$$ &Local $$ &Other") % fd, 0) | 182 "$$ &Local $$ &Other") % fd, 0) |
| 183 choice = ['local', 'other'][index] | 183 choice = ['local', 'other'][index] |
| 184 | 184 |
| 185 if choice == 'other': | 185 if choice == 'other': |