--- a/mercurial/merge.py Tue Nov 05 12:10:38 2019 -0500
+++ b/mercurial/merge.py Tue Nov 05 08:42:42 2019 -0800
@@ -171,7 +171,7 @@
self._local = None
self._other = None
self._labels = labels
- for var in (b'localctx', b'otherctx'):
+ for var in ('localctx', 'otherctx'):
if var in vars(self):
delattr(self, var)
if node:
@@ -196,7 +196,7 @@
self._stateextras = {}
self._local = None
self._other = None
- for var in (b'localctx', b'otherctx'):
+ for var in ('localctx', 'otherctx'):
if var in vars(self):
delattr(self, var)
self._readmergedriver = None