Show More
@@ -267,6 +267,11 b' class mergestate(object):' | |||
|
267 | 267 | self._labels = [l for l in labels if len(l) > 0] |
|
268 | 268 | elif not rtype.islower(): |
|
269 | 269 | unsupported.add(rtype) |
|
270 | # contains a mapping of form: | |
|
271 | # {filename : (merge_return_value, action_to_be_performed} | |
|
272 | # these are results of re-running merge process | |
|
273 | # this dict is used to perform actions on dirstate caused by re-running | |
|
274 | # the merge | |
|
270 | 275 | self._results = {} |
|
271 | 276 | self._dirty = False |
|
272 | 277 |
General Comments 0
You need to be logged in to leave comments.
Login now