210 f, f2, f, fmerge(f, f2, f2), False) |
210 f, f2, f, fmerge(f, f2, f2), False) |
211 else: # case 4,21 A/B/B |
211 else: # case 4,21 A/B/B |
212 act("local moved to " + f2, "m", |
212 act("local moved to " + f2, "m", |
213 f, f2, f, fmerge(f, f2, f2), False) |
213 f, f2, f, fmerge(f, f2, f2), False) |
214 elif f in ma and not n[20:]: |
214 elif f in ma and not n[20:]: |
215 if n != ma[f] and not overwrite: |
215 if n != ma[f]: |
216 if repo.ui.prompt( |
216 if repo.ui.prompt( |
217 _(" local changed %s which remote deleted\n" |
217 _(" local changed %s which remote deleted\n" |
218 "use (c)hanged version or (d)elete?") % f, |
218 "use (c)hanged version or (d)elete?") % f, |
219 (_("&Changed"), _("&Delete")), _("c")) == _("d"): |
219 (_("&Changed"), _("&Delete")), _("c")) == _("d"): |
220 act("prompt delete", "r", f) |
220 act("prompt delete", "r", f) |