--- a/mercurial/commands.py	Wed Feb 28 10:38:09 2018 -0800
+++ b/mercurial/commands.py	Wed Feb 28 19:54:10 2018 +0530
@@ -4482,7 +4482,7 @@
                 for f in ms:
                     if not m(f):
                         continue
-                    flags = ''.join(['-%s ' % o[0] for o in flaglist
+                    flags = ''.join(['-%s ' % o[0:1] for o in flaglist
                                                    if opts.get(o)])
                     hint = _("(try: hg resolve %s%s)\n") % (
                              flags,