Show More
@@ -261,7 +261,7 b' class _mergestate_base(object):' | |||||
261 | hex(fco.filenode()), |
|
261 | hex(fco.filenode()), | |
262 | fcl.flags(), |
|
262 | fcl.flags(), | |
263 | ] |
|
263 | ] | |
264 |
self._stateextras[fd] |
|
264 | self._stateextras[fd][b'ancestorlinknode'] = hex(fca.node()) | |
265 | self._dirty = True |
|
265 | self._dirty = True | |
266 |
|
266 | |||
267 | def addpathconflict(self, path, frename, forigin): |
|
267 | def addpathconflict(self, path, frename, forigin): |
General Comments 0
You need to be logged in to leave comments.
Login now