merge: break up a not-so-one-liner for readability

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

mercurial/merge.py

@@ -336,10 +336,9 b' def _checkcollision(repo, wmf, mresult):'
     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