mercurial/merge.py

--- a/mercurial/merge.py	Tue Nov 17 14:22:30 2015 -0800
+++ b/mercurial/merge.py	Tue Nov 17 14:04:56 2015 -0800
@@ -87,12 +87,15 @@
     def read(repo):
         """Initialize the merge state, reading it from disk."""
         ms = mergestate(repo)
+        ms._read()
         return ms
 
     def __init__(self, repo):
+        """Initialize the merge state.
+
+        Do not use this directly! Instead call read() or clean()."""
         self._repo = repo
         self._dirty = False
-        self._read()
 
     def reset(self, node=None, other=None):
         self._state = {}