equal
deleted
inserted
replaced
296 prompts.append((f, "dc")) # prompt deleted/changed |
296 prompts.append((f, "dc")) # prompt deleted/changed |
297 |
297 |
298 for f, m in sorted(prompts): |
298 for f, m in sorted(prompts): |
299 if m == "cd": |
299 if m == "cd": |
300 if repo.ui.promptchoice( |
300 if repo.ui.promptchoice( |
301 _(" local changed %s which remote deleted\n" |
301 _("local changed %s which remote deleted\n" |
302 "use (c)hanged version or (d)elete?") % f, |
302 "use (c)hanged version or (d)elete?") % f, |
303 (_("&Changed"), _("&Delete")), 0): |
303 (_("&Changed"), _("&Delete")), 0): |
304 act("prompt delete", "r", f) |
304 act("prompt delete", "r", f) |
305 else: |
305 else: |
306 act("prompt keep", "a", f) |
306 act("prompt keep", "a", f) |