# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1244502884 18000
# Node ID ff8519c437c644f84d63165b62be0b60f87aa343
# Parent  60fa3371aa75fb8c4ca1070fdcf3398f5c845e5d
merge: remove a flags case

diff -r 60fa3371aa75 -r ff8519c437c6 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
@@ -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)