# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 1447367342 28800
# Node ID b639b2f186bfc6a8c7a8818910d49e94afd1dcae
# Parent  067ab07435c9fd67efc7da186e4836d9cfa18cbd
merge.applyupdates: only attempt to merge files in mergeactions

This only makes a difference when a merge driver is active -- in that case we
don't want to try and merge all the files, just the ones still unresolved after
the merge driver's preprocess step is over.

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)