--- a/mercurial/pathutil.py	Wed Nov 01 16:54:39 2017 -0500
+++ b/mercurial/pathutil.py	Thu Nov 02 20:35:31 2017 -0400
@@ -184,8 +184,10 @@
         try:
             if cwd != root:
                 canonpath(root, root, myname, auditor)
-                hint = (_("consider using '--cwd %s'")
-                        % os.path.relpath(root, cwd))
+                relpath = util.pathto(root, cwd, '')
+                if relpath[-1] == pycompat.ossep:
+                    relpath = relpath[:-1]
+                hint = (_("consider using '--cwd %s'") % relpath)
         except error.Abort:
             pass