changeset 8743 | a8d5af707656 |
parent 8742 | a964ab624385 |
child 8744 | 6b675c781c6d |
--- a/mercurial/merge.py Mon Jun 08 18:14:44 2009 -0500 +++ b/mercurial/merge.py Mon Jun 08 18:14:44 2009 -0500 @@ -191,8 +191,7 @@ act("clobbering", "g", f, rflags) # or are we going back in time and clean? elif backwards: - if not n[20:] or not p2[f].cmp(p1[f].data()): - act("reverting", "g", f, rflags) + act("reverting", "g", f, rflags) else: act("remote is newer", "g", f, rflags) # local is newer, not overwrite, check mode bits