Mercurial > hg

changeset 3117:7a635ef25132

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: simplify tests for local changed/remote deleted
author Matt Mackall <mpm@selenic.com>
date Sun, 17 Sep 2006 20:18:27 -0500
parents 920f54a2249e
children 5644a05a608c
files mercurial/merge.py
diffstat 1 files changed, 4 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/merge.py	Sun Sep 17 20:10:54 2006 -0500
+++ b/mercurial/merge.py	Sun Sep 17 20:18:27 2006 -0500
@@ -148,12 +148,10 @@
                         action.append((f, "e", m2.execf(f)))
             del m2[f]
         elif f in ma:
-            if n != ma[f]:
-                r = _("d")
-                if not overwrite:
-                    r = ui.prompt(
-                        (_(" local changed %s which remote deleted\n") % f) +
-                         _("(k)eep or (d)elete?"), _("[kd]"), _("k"))
+            if n != ma[f] and not overwrite:
+                r = ui.prompt(
+                    (_(" local changed %s which remote deleted\n") % f) +
+                    _("(k)eep or (d)elete?"), _("[kd]"), _("k"))
                 if r == _("d"):
                     action.append((f, "r"))
             else: