Mercurial > hg

changeset 8740:cef68b50078c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: drop recreating case
author Matt Mackall <mpm@selenic.com>
date Mon, 08 Jun 2009 18:14:44 -0500
parents 226f1005133c
children e592180ba435
files mercurial/merge.py
diffstat 1 files changed, 1 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/merge.py	Mon Jun 08 18:14:44 2009 -0500
+++ b/mercurial/merge.py	Mon Jun 08 18:14:44 2009 -0500
@@ -248,9 +248,7 @@
                 act("remote moved to " + f, "m",
                     f2, f, f, fmerge(f2, f, f2), True)
         elif f in ma:
-            if overwrite or backwards:
-                act("recreating", "g", f, m2.flags(f))
-            elif n != ma[f]:
+            if n != ma[f]:
                 if repo.ui.prompt(
                     _("remote changed %s which local deleted\n"
                       "use (c)hanged version or leave (d)eleted?") % f,