--- a/mercurial/merge.py Thu Jun 25 17:52:20 2015 -0500+++ b/mercurial/merge.py Thu Jun 25 17:53:16 2015 -0500@@ -1070,6 +1070,7 @@ # Allow jumping branches if clean and specific rev given pas = [p1]+ # deprecated config: merge.followcopies followcopies = False if overwrite: pas = [wc]