diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -2420,6 +2420,8 @@
                     hint = _(b"commit or update --clean to discard changes")
                     raise error.Abort(msg, hint=hint)
 
+        uipathfn = scmutil.getuipathfn(repo)
+
         # Prompt and create actions. Most of this is in the resolve phase
         # already, but we can't handle .hgsubstate in filemerge or
         # subrepoutil.submerge yet so we have to keep prompting for it.
@@ -2427,7 +2429,7 @@
             f = b'.hgsubstate'
             m, args, msg = actionbyfile[f]
             prompts = filemerge.partextras(labels)
-            prompts[b'f'] = f
+            prompts[b'f'] = uipathfn(f)
             if m == ACTION_CHANGED_DELETED:
                 if repo.ui.promptchoice(
                     _(
@@ -2493,7 +2495,7 @@
                     b"note: possible conflict - %s was renamed "
                     b"multiple times to:\n"
                 )
-                % f
+                % uipathfn(f)
             )
             for nf in sorted(fl):
                 repo.ui.warn(b" %s\n" % nf)
@@ -2505,10 +2507,10 @@
                     b"note: possible conflict - %s was deleted "
                     b"and renamed to:\n"
                 )
-                % f
+                % uipathfn(f)
             )
             for nf in sorted(fl):
-                repo.ui.warn(b" %s\n" % nf)
+                repo.ui.warn(b" %s\n" % uipathfn(nf))
 
         ### apply phase
         if not branchmerge:  # just jump to the new rev