--- a/mercurial/simplemerge.py	Fri Jan 14 08:44:36 2022 -0800
+++ b/mercurial/simplemerge.py	Fri Jan 14 09:28:44 2022 -0800
@@ -483,7 +483,7 @@
         basetext = readctx(basectx)
         othertext = readctx(otherctx)
     except error.Abort:
-        return 1
+        return True
 
     m3 = Merge3Text(basetext, localtext, othertext)
     conflicts = False
@@ -511,5 +511,4 @@
         # mergestate.resolve())
         localctx.write(mergedtext, localctx.flags())
 
-    if conflicts:
-        return 1
+    return conflicts