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

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

diff -r 10407e8e3807 -r d8577d00c023 mercurial/merge.py
--- a/mercurial/merge.py	Fri Jan 28 14:23:49 2022 +0100
+++ b/mercurial/merge.py	Fri Jan 28 14:23:56 2022 +0100
@@ -346,10 +346,9 @@
     for fold, f in sorted(foldmap.items()):
         if fold.startswith(foldprefix) and not f.startswith(unfoldprefix):
             # the folded prefix matches but actual casing is different
-            raise error.StateError(
-                _(b"case-folding collision between %s and directory of %s")
-                % (lastfull, f)
-            )
+            msg = _(b"case-folding collision between %s and directory of %s")
+            msg %= (lastfull, f)
+            raise error.StateError(msg)
         foldprefix = fold + b'/'
         unfoldprefix = f + b'/'
         lastfull = f