--- a/mercurial/merge.py	Sun May 13 17:45:08 2012 +0200
+++ b/mercurial/merge.py	Tue Apr 22 02:09:24 2014 +0200
@@ -762,8 +762,8 @@
                                     branchmerge, force,
                                     partial, acceptremote, followcopies)
             for a in sorted(actions):
-                repo.ui.debug(' %s: %s\n' % (a[0], a[1]))
-                f = a[0]
+                f, m, args, msg = a
+                repo.ui.debug(' %s: %s -> %s\n' % (f, msg, m))
                 if f in fbids:
                     fbids[f].append(a)
                 else: