# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 1447808693 28800
# Node ID 11b1832db8ae6e98474e4c21556a33518dfe3842
# Parent  a65ea44f163e589051e69d3c62569c17365fb0d7
merge.applyupdates: switch to mergestate.clean()

See the previous patches for why we're doing this.

diff -r a65ea44f163e -r 11b1832db8ae mercurial/merge.py
--- a/mercurial/merge.py	Tue Nov 17 17:04:32 2015 -0800
+++ b/mercurial/merge.py	Tue Nov 17 17:04:53 2015 -0800
@@ -853,8 +853,7 @@
     """
 
     updated, merged, removed, unresolved = 0, 0, 0, 0
-    ms = mergestate(repo)
-    ms.reset(wctx.p1().node(), mctx.node())
+    ms = mergestate.clean(repo, wctx.p1().node(), mctx.node())
     moves = []
     for m, l in actions.items():
         l.sort()