Mercurial > public > mercurial-scm > hg-stable

diff mercurial/merge.py @ 48414:8e855e9984a6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
errors: use detailed exit code when trying to merge file outside narrowspec Differential Revision: https://phab.mercurial-scm.org/D11827
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 19 Nov 2021 15:39:35 -0800
parents 96aa3a68d3b5
children c655483ea6e2
line wrap: on
line diff
--- 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
             )