# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1158543786 18000
# Node ID b1de36a4b4dfd2039a694403d5f2956900a5de83
# Parent  5644a05a608cdb3ace68d469b77fe1e9eb9831a7
merge: simplify prompt code

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -142,10 +142,9 @@ def manifestmerge(ui, m1, m2, ma, overwr
             del m2[f]
         elif f in ma:
             if n != ma[f] and not overwrite:
-                r = ui.prompt(
+                if ui.prompt(
                     (_(" local changed %s which remote deleted\n") % f) +
-                    _("(k)eep or (d)elete?"), _("[kd]"), _("k"))
-                if r == _("d"):
+                    _("(k)eep or (d)elete?"), _("[kd]"), _("k")) == _("d"):
                     action.append((f, "r"))
             else:
                 ui.debug(_("other deleted %s\n") % f)
@@ -170,10 +169,9 @@ def manifestmerge(ui, m1, m2, ma, overwr
                 ui.debug(_("local deleted %s, recreating\n") % f)
                 action.append((f, "g", m2.execf(f), n))
             elif n != ma[f]:
-                r = ui.prompt(
+                if ui.prompt(
                     (_("remote changed %s which local deleted\n") % f) +
-                    _("(k)eep or (d)elete?"), _("[kd]"), _("k"))
-                if r == _("k"):
+                    _("(k)eep or (d)elete?"), _("[kd]"), _("k")) == _("k"):
                     action.append((f, "g", m2.execf(f), n))
             else:
                 ui.debug(_("local deleted %s\n") % f)