--- a/mercurial/simplemerge.py Mon Mar 21 10:55:50 2022 +0100
+++ b/mercurial/simplemerge.py Tue Jan 18 13:05:21 2022 -0800
@@ -490,6 +490,9 @@
self._text = self.fctx.decodeddata()
return self._text
+ def set_text(self, text):
+ self._text = text
+
def simplemerge(
local,