mercurial/mergestate.py
changeset 45583 9f14bb4d59ea
parent 45525 590a840fa367
child 45714 ecf6d7aa874b
--- a/mercurial/mergestate.py	Mon Sep 14 14:11:45 2020 +0530
+++ b/mercurial/mergestate.py	Fri Sep 25 13:58:05 2020 +0530
@@ -261,7 +261,7 @@
             hex(fco.filenode()),
             fcl.flags(),
         ]
-        self._stateextras[fd] = {b'ancestorlinknode': hex(fca.node())}
+        self._stateextras[fd][b'ancestorlinknode'] = hex(fca.node())
         self._dirty = True
 
     def addpathconflict(self, path, frename, forigin):