Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: drop an overwrite test
authorMatt Mackall <mpm@selenic.com>
Mon, 08 Jun 2009 18:14:44 -0500
changeset 8739 226f1005133c
parent 8738 8a9899a6327e
child 8740 cef68b50078c
merge: drop an overwrite test
mercurial/merge.py file | annotate | diff | comparison | revisions 
--- a/mercurial/merge.py	Mon Jun 08 18:14:44 2009 -0500
+++ b/mercurial/merge.py	Mon Jun 08 18:14:44 2009 -0500
@@ -212,7 +212,7 @@
                 act("local moved to " + f2, "m",
                     f, f2, f, fmerge(f, f2, f2), False)
         elif f in ma and not n[20:]:
-            if n != ma[f] and not overwrite:
+            if n != ma[f]:
                 if repo.ui.prompt(
                     _(" local changed %s which remote deleted\n"
                       "use (c)hanged version or (d)elete?") % f,
Mercurial