Show More
@@ -175,9 +175,12 b' def _iprompt(repo, mynode, orig, fcd, fc' | |||||
175 | ui = repo.ui |
|
175 | ui = repo.ui | |
176 | fd = fcd.path() |
|
176 | fd = fcd.path() | |
177 |
|
177 | |||
178 |
i |
|
178 | index = ui.promptchoice(_(" no tool found to merge %s\n" | |
179 | "keep (l)ocal or take (o)ther?" |
|
179 | "keep (l)ocal or take (o)ther?" | |
180 |
"$$ &Local $$ &Other") % fd, 0) |
|
180 | "$$ &Local $$ &Other") % fd, 0) | |
|
181 | choice = ['local', 'other'][index] | |||
|
182 | ||||
|
183 | if choice == 'other': | |||
181 | return _iother(repo, mynode, orig, fcd, fco, fca, toolconf) |
|
184 | return _iother(repo, mynode, orig, fcd, fco, fca, toolconf) | |
182 | else: |
|
185 | else: | |
183 | return _ilocal(repo, mynode, orig, fcd, fco, fca, toolconf) |
|
186 | return _ilocal(repo, mynode, orig, fcd, fco, fca, toolconf) |
General Comments 0
You need to be logged in to leave comments.
Login now