# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1244502884 18000
# Node ID 7619b16ea880026696eb7e6ede5e417b0123dc05
# Parent  ff8519c437c644f84d63165b62be0b60f87aa343
merge: fix prompt keep

diff -r ff8519c437c6 -r 7619b16ea880 mercurial/merge.py
--- 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