--- a/mercurial/cmdutil.py	Wed Feb 25 18:12:01 2015 -0500
+++ b/mercurial/cmdutil.py	Mon Mar 02 17:32:37 2015 -0600
@@ -2266,6 +2266,8 @@
                 date = ctx.date()
                 # Recompute copies (avoid recording a -> b -> a)
                 copied = copies.pathcopies(base, ctx)
+                if old.p2:
+                    copied.update(copies.pathcopies(old.p2(), ctx))
 
                 # Prune files which were reverted by the updates: if old
                 # introduced file X and our intermediate commit, node,