# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1643376281 -3600
# Node ID ec23b0ba85c2d3dd37367872fa5dbe5e13c60316
# Parent  85c69b0dfa8fe8245a2c81c88bc8b4a3f514a9be
merge: break up a not-so-one-liner for readability

Differential Revision: https://phab.mercurial-scm.org/D12105

diff -r 85c69b0dfa8f -r ec23b0ba85c2 mercurial/merge.py
--- a/mercurial/merge.py	Fri Jan 28 14:24:30 2022 +0100
+++ b/mercurial/merge.py	Fri Jan 28 14:24:41 2022 +0100
@@ -537,9 +537,8 @@
             hint = _(b'merging in the other direction may work')
             raise error.Abort(msg % f, hint=hint)
         else:
-            raise error.StateError(
-                _(b'conflict in file \'%s\' is outside narrow clone') % f
-            )
+            msg = _(b'conflict in file \'%s\' is outside narrow clone')
+            raise error.StateError(msg % f)
 
 
 class mergeresult(object):