Mercurial > public > mercurial-scm > hg

comparison mercurial/merge.py @ 8736:7619b16ea880

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: fix prompt keep
author Matt Mackall <mpm@selenic.com>
date Mon, 08 Jun 2009 18:14:44 -0500
parents ff8519c437c6
children a1808b40a8fb
comparison
equal deleted inserted replaced
8735:ff8519c437c6 8736:7619b16ea880
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: