Show More
@@ -287,7 +287,7 b' class mergestate(object):' | |||||
287 | if entry[0] == 'u': |
|
287 | if entry[0] == 'u': | |
288 | yield f |
|
288 | yield f | |
289 |
|
289 | |||
290 | def resolve(self, dfile, wctx, labels=None): |
|
290 | def _resolve(self, dfile, wctx, labels=None): | |
291 | """rerun merge process for file path `dfile`""" |
|
291 | """rerun merge process for file path `dfile`""" | |
292 | if self[dfile] == 'r': |
|
292 | if self[dfile] == 'r': | |
293 | return 0 |
|
293 | return 0 | |
@@ -323,6 +323,10 b' class mergestate(object):' | |||||
323 | self.mark(dfile, 'r') |
|
323 | self.mark(dfile, 'r') | |
324 | return r |
|
324 | return r | |
325 |
|
325 | |||
|
326 | def resolve(self, dfile, wctx, labels=None): | |||
|
327 | """rerun merge process for file path `dfile`""" | |||
|
328 | return self._resolve(dfile, wctx, labels=labels) | |||
|
329 | ||||
326 | def _checkunknownfile(repo, wctx, mctx, f, f2=None): |
|
330 | def _checkunknownfile(repo, wctx, mctx, f, f2=None): | |
327 | if f2 is None: |
|
331 | if f2 is None: | |
328 | f2 = f |
|
332 | f2 = f |
General Comments 0
You need to be logged in to leave comments.
Login now