--- a/mercurial/merge.py	Mon Feb 06 15:36:44 2012 -0600
+++ b/mercurial/merge.py	Thu Feb 09 13:16:20 2012 -0600
@@ -558,7 +558,7 @@
                                    " --check to force update)"))
             else:
                 # Allow jumping branches if clean and specific rev given
-                overwrite = True
+                pa = p1
 
         ### calculate phase
         action = []