Mercurial > hg

changeset 8735:ff8519c437c6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: remove a flags case
author Matt Mackall <mpm@selenic.com>
date Mon, 08 Jun 2009 18:14:44 -0500
parents 60fa3371aa75
children 7619b16ea880
files mercurial/merge.py
diffstat 1 files changed, 1 insertions(+), 4 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
@@ -174,10 +174,7 @@
         if partial and not partial(f):
             continue
         if f in m2:
-            if overwrite or backwards:
-                rflags = m2.flags(f)
-            else:
-                rflags = fmerge(f, f, f)
+            rflags = fmerge(f, f, f)
             # are files different?
             if n != m2[f]:
                 a = ma.get(f, nullid)