251 choice = ['other', 'local', 'unresolved'][index] |
251 choice = ['other', 'local', 'unresolved'][index] |
252 else: |
252 else: |
253 index = ui.promptchoice( |
253 index = ui.promptchoice( |
254 _("no tool found to merge %s\n" |
254 _("no tool found to merge %s\n" |
255 "keep (l)ocal, take (o)ther, or leave (u)nresolved?" |
255 "keep (l)ocal, take (o)ther, or leave (u)nresolved?" |
256 "$$ &Local $$ &Other $$ &Unresolved") % fd, 0) |
256 "$$ &Local $$ &Other $$ &Unresolved") % fd, 2) |
257 choice = ['local', 'other', 'unresolved'][index] |
257 choice = ['local', 'other', 'unresolved'][index] |
258 |
258 |
259 if choice == 'other': |
259 if choice == 'other': |
260 return _iother(repo, mynode, orig, fcd, fco, fca, toolconf) |
260 return _iother(repo, mynode, orig, fcd, fco, fca, toolconf) |
261 elif choice == 'local': |
261 elif choice == 'local': |