Mercurial > hg-stable

changeset 2970:fa9c769fee8a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: minor simplification
author Matt Mackall <mpm@selenic.com>
date Tue, 22 Aug 2006 16:12:54 -0500
parents 833677bc9791
children 33dcf03ef45f
files mercurial/merge.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/merge.py	Mon Aug 21 14:25:56 2006 -0500
+++ b/mercurial/merge.py	Tue Aug 22 16:12:54 2006 -0500
@@ -181,7 +181,7 @@
         elif f in ma:
             if n != ma[f]:
                 r = _("d")
-                if not overwrite and (linear_path or branchmerge):
+                if not overwrite:
                     r = repo.ui.prompt(
                         (_(" local changed %s which remote deleted\n") % f) +
                          _("(k)eep or (d)elete?"), _("[kd]"), _("k"))
@@ -211,7 +211,7 @@
             continue
         if f in ma and n != ma[f]:
             r = _("k")
-            if not overwrite and (linear_path or branchmerge):
+            if not overwrite:
                 r = repo.ui.prompt(
                     (_("remote changed %s which local deleted\n") % f) +
                      _("(k)eep or (d)elete?"), _("[kd]"), _("k"))