Show More
@@ -75,6 +75,14 b' class mergestate(object):' | |||||
75 | statepathv1 = 'merge/state' |
|
75 | statepathv1 = 'merge/state' | |
76 | statepathv2 = 'merge/state2' |
|
76 | statepathv2 = 'merge/state2' | |
77 |
|
77 | |||
|
78 | @staticmethod | |||
|
79 | def clean(repo, node=None, other=None): | |||
|
80 | """Initialize a brand new merge state, removing any existing state on | |||
|
81 | disk.""" | |||
|
82 | ms = mergestate(repo) | |||
|
83 | ms.reset(node, other) | |||
|
84 | return ms | |||
|
85 | ||||
78 | def __init__(self, repo): |
|
86 | def __init__(self, repo): | |
79 | self._repo = repo |
|
87 | self._repo = repo | |
80 | self._dirty = False |
|
88 | self._dirty = False |
General Comments 0
You need to be logged in to leave comments.
Login now