Mercurial > public > mercurial-scm > hg
diff mercurial/commands.py @ 36473:ab5f18a9dcac
py3: slice over bytes or use startswith() to prevent getting ascii values
Differential Revision: https://phab.mercurial-scm.org/D2496
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Wed, 28 Feb 2018 19:54:10 +0530 |
parents | 04c319a07c7b |
children | 6e90c59b6da1 |
line wrap: on
line diff
--- 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,