diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -1151,8 +1151,8 @@ def applyupdates(repo, actions, wctx, mc
     removed += msremoved
 
     extraactions = ms.actions()
-    for a in 'rag':
-        actions[a].extend(extraactions[a])
+    for k, acts in extraactions.iteritems():
+        actions[k].extend(acts)
 
     progress(_updating, None, total=numupdates, unit=_files)