diff -r 067ab07435c9 -r b639b2f186bf mercurial/merge.py
--- a/mercurial/merge.py	Wed Nov 11 17:34:28 2015 -0800
+++ b/mercurial/merge.py	Thu Nov 12 14:29:02 2015 -0800
@@ -970,7 +970,7 @@
 
     # premerge
     tocomplete = []
-    for f, args, msg in actions['m']:
+    for f, args, msg in mergeactions:
         repo.ui.debug(" %s: %s -> m (premerge)\n" % (f, msg))
         z += 1
         progress(_updating, z, item=f, total=numupdates, unit=_files)