Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: fix prompt keep
authorMatt Mackall <mpm@selenic.com>
Mon, 08 Jun 2009 18:14:44 -0500
changeset 8736 7619b16ea880
parent 8735 ff8519c437c6
child 8737 a1808b40a8fb
merge: fix prompt keep
mercurial/merge.py file | annotate | diff | comparison | revisions 
--- 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
Mercurial