diff -r 937998e43e93 -r 10407e8e3807 mercurial/merge.py
--- a/mercurial/merge.py	Fri Jan 28 14:23:37 2022 +0100
+++ b/mercurial/merge.py	Fri Jan 28 14:23:49 2022 +0100
@@ -336,10 +336,9 @@
     for f in pmmf:
         fold = util.normcase(f)
         if fold in foldmap:
-            raise error.StateError(
-                _(b"case-folding collision between %s and %s")
-                % (f, foldmap[fold])
-            )
+            msg = _(b"case-folding collision between %s and %s")
+            msg %= (f, foldmap[fold])
+            raise error.StateError(msg)
         foldmap[fold] = f
 
     # check case-folding of directories