mercurial/cmdutil.py

--- a/mercurial/cmdutil.py	Sat Oct 21 17:46:41 2017 +0900
+++ b/mercurial/cmdutil.py	Tue Nov 07 13:18:49 2017 -0500
@@ -570,9 +570,8 @@
     unresolvedlist = [f for f in mergestate.unresolved() if m(f)]
     if unresolvedlist:
         mergeliststr = '\n'.join(
-            ['    %s' % os.path.relpath(
-                os.path.join(repo.root, path),
-                pycompat.getcwd()) for path in unresolvedlist])
+            ['    %s' % util.pathto(repo.root, pycompat.getcwd(), path)
+             for path in unresolvedlist])
         msg = _('''Unresolved merge conflicts:
 
 %s