equal
deleted
inserted
replaced
215 if repo.ui.prompt( |
215 if repo.ui.prompt( |
216 _(" local changed %s which remote deleted\n" |
216 _(" local changed %s which remote deleted\n" |
217 "use (c)hanged version or (d)elete?") % f, |
217 "use (c)hanged version or (d)elete?") % f, |
218 (_("&Changed"), _("&Delete")), _("c")) == _("d"): |
218 (_("&Changed"), _("&Delete")), _("c")) == _("d"): |
219 act("prompt delete", "r", f) |
219 act("prompt delete", "r", f) |
220 act("prompt keep", "a", f) |
220 else: |
|
221 act("prompt keep", "a", f) |
221 else: |
222 else: |
222 act("other deleted", "r", f) |
223 act("other deleted", "r", f) |
223 elif overwrite and n[20:] == "a": # do not erase the working copy |
224 elif overwrite and n[20:] == "a": # do not erase the working copy |
224 act("remote deleted", "f", f) |
225 act("remote deleted", "f", f) |
225 else: |
226 else: |