# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 2015-11-17 21:58:50
# Node ID bf3eec62212f79021c16fc0b6ed075d503201d6f
# Parent  d5a6be56970b60d2dae2efa235be1643f6209946

localrepo.commit: switch to mergestate.read()

See previous patches for why we're doing this.

diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -1556,7 +1556,7 @@ class localrepository(object):
                 raise error.Abort(_("cannot commit merge with missing files"))
 
             unresolved, driverresolved = False, False
-            ms = mergemod.mergestate(self)
+            ms = mergemod.mergestate.read(self)
             for f in status.modified:
                 if f in ms:
                     if ms[f] == 'u':