# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1244502884 18000
# Node ID 84c44c9ed555d35317c8a298eb6db80cdd0bdeb9
# Parent  8fd6f6b8b37d4beb09fd558c6fbc83543d307127
merge: combine three identical 'remote is newer' cases

diff -r 8fd6f6b8b37d -r 84c44c9ed555 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
@@ -186,14 +186,7 @@
                     act("versions differ", "m", f, f, f, rflags, False)
                 # is remote's version newer?
                 elif m2[f] != a:
-                    # are we clobbering?
-                    if overwrite:
-                        act("clobbering", "g", f, rflags)
-                    # or are we going back in time and clean?
-                    elif backwards:
-                        act("reverting", "g", f, rflags)
-                    else:
-                        act("remote is newer", "g", f, rflags)
+                    act("remote is newer", "g", f, rflags)
                 # local is newer, not overwrite, check mode bits
                 elif m1.flags(f) != rflags:
                     act("update permissions", "e", f, rflags)