--- a/mercurial/merge.py	Fri Nov 20 16:43:25 2015 -0800
+++ b/mercurial/merge.py	Fri Nov 20 11:26:31 2015 -0800
@@ -1119,6 +1119,11 @@
     updated += msupdated
     merged += msmerged
     removed += msremoved
+
+    extraactions = ms.actions()
+    for a in 'rag':
+        actions[a].extend(extraactions[a])
+
     progress(_updating, None, total=numupdates, unit=_files)
 
     return updated, merged, removed, unresolved