Skip to content
Snippets Groups Projects
Commit d6b7c4e7 authored by Yuya Nishihara's avatar Yuya Nishihara
Browse files

py3: convert "usage" literal to bytes

Here _() is practically an identity function, but we shouldn't pass in
unicode to _().
parent 12e2e5cd
No related branches found
No related tags found
No related merge requests found
......@@ -28,7 +28,7 @@
(b'h', b'help', None, _(b'display help and exit')),
(b'q', b'quiet', None, _(b'suppress output'))]
usage = _('''simplemerge [OPTS] LOCAL BASE OTHER
usage = _(b'''simplemerge [OPTS] LOCAL BASE OTHER
Simple three-way file merge utility with a minimal feature set.
......@@ -41,7 +41,7 @@
"""Exception raised on errors in parsing the command line."""
def showhelp():
pycompat.stdout.write(usage.encode('utf8'))
pycompat.stdout.write(usage)
pycompat.stdout.write(b'\noptions:\n')
out_opts = []
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment