Show More
@@ -331,7 +331,7 b' class mergestate(object):' | |||||
331 |
|
331 | |||
332 | def _resolve(self, preresolve, dfile, wctx, labels=None): |
|
332 | def _resolve(self, preresolve, dfile, wctx, labels=None): | |
333 | """rerun merge process for file path `dfile`""" |
|
333 | """rerun merge process for file path `dfile`""" | |
334 |
if self[dfile] |
|
334 | if self[dfile] in 'rd': | |
335 | return True, 0 |
|
335 | return True, 0 | |
336 | stateentry = self._state[dfile] |
|
336 | stateentry = self._state[dfile] | |
337 | state, hash, lfile, afile, anode, ofile, onode, flags = stateentry |
|
337 | state, hash, lfile, afile, anode, ofile, onode, flags = stateentry |
General Comments 0
You need to be logged in to leave comments.
Login now