Show More
@@ -83,6 +83,12 b' class mergestate(object):' | |||||
83 | ms.reset(node, other) |
|
83 | ms.reset(node, other) | |
84 | return ms |
|
84 | return ms | |
85 |
|
85 | |||
|
86 | @staticmethod | |||
|
87 | def read(repo): | |||
|
88 | """Initialize the merge state, reading it from disk.""" | |||
|
89 | ms = mergestate(repo) | |||
|
90 | return ms | |||
|
91 | ||||
86 | def __init__(self, repo): |
|
92 | def __init__(self, repo): | |
87 | self._repo = repo |
|
93 | self._repo = repo | |
88 | self._dirty = False |
|
94 | self._dirty = False |
General Comments 0
You need to be logged in to leave comments.
Login now