238 try: |
238 try: |
239 if fco.isabsent(): |
239 if fco.isabsent(): |
240 index = ui.promptchoice( |
240 index = ui.promptchoice( |
241 _("local changed %s which remote deleted\n" |
241 _("local changed %s which remote deleted\n" |
242 "use (c)hanged version, (d)elete, or leave (u)nresolved?" |
242 "use (c)hanged version, (d)elete, or leave (u)nresolved?" |
243 "$$ &Changed $$ &Delete $$ &Unresolved") % fd, 0) |
243 "$$ &Changed $$ &Delete $$ &Unresolved") % fd, 2) |
244 choice = ['local', 'other', 'unresolved'][index] |
244 choice = ['local', 'other', 'unresolved'][index] |
245 elif fcd.isabsent(): |
245 elif fcd.isabsent(): |
246 index = ui.promptchoice( |
246 index = ui.promptchoice( |
247 _("remote changed %s which local deleted\n" |
247 _("remote changed %s which local deleted\n" |
248 "use (c)hanged version, leave (d)eleted, or " |
248 "use (c)hanged version, leave (d)eleted, or " |
249 "leave (u)nresolved?" |
249 "leave (u)nresolved?" |
250 "$$ &Changed $$ &Deleted $$ &Unresolved") % fd, 0) |
250 "$$ &Changed $$ &Deleted $$ &Unresolved") % fd, 2) |
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?" |