# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1244502884 18000
# Node ID cef68b50078ca43069983fca9d1358d2cb4aa131
# Parent  226f1005133cb2a90ada0722a91d02e824afdafe
merge: drop recreating case

diff -r 226f1005133c -r cef68b50078c 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
@@ -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,