diff -r 67064c238ae7 -r 8e855e9984a6 mercurial/merge.py
--- a/mercurial/merge.py	Fri Nov 19 15:38:36 2021 -0800
+++ b/mercurial/merge.py	Fri Nov 19 15:39:35 2021 -0800
@@ -542,7 +542,7 @@
                 hint=_(b'merging in the other direction may work'),
             )
         else:
-            raise error.Abort(
+            raise error.StateError(
                 _(b'conflict in file \'%s\' is outside narrow clone') % f
             )