Mercurial > hg

changeset 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
files mercurial/merge.py
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/merge.py	Mon Jun 08 18:14:44 2009 -0500
+++ b/mercurial/merge.py	Mon Jun 08 18:14:44 2009 -0500
@@ -217,7 +217,8 @@
                       "use (c)hanged version or (d)elete?") % f,
                     (_("&Changed"), _("&Delete")), _("c")) == _("d"):
                     act("prompt delete", "r", f)
-                act("prompt keep", "a", f)
+                else:
+                    act("prompt keep", "a", f)
             else:
                 act("other deleted", "r", f)
         elif overwrite and n[20:] == "a": # do not erase the working copy