--- a/tests/fakemergerecord.py	Tue Feb 13 18:48:47 2018 -0500
+++ b/tests/fakemergerecord.py	Tue Feb 13 18:49:06 2018 -0500
@@ -12,15 +12,15 @@
 cmdtable = {}
 command = registrar.command(cmdtable)
 
-@command('fakemergerecord',
-         [('X', 'mandatory', None, 'add a fake mandatory record'),
-          ('x', 'advisory', None, 'add a fake advisory record')], '')
+@command(b'fakemergerecord',
+         [(b'X', b'mandatory', None, b'add a fake mandatory record'),
+          (b'x', b'advisory', None, b'add a fake advisory record')], '')
 def fakemergerecord(ui, repo, *pats, **opts):
     with repo.wlock():
         ms = merge.mergestate.read(repo)
         records = ms._makerecords()
         if opts.get('mandatory'):
-            records.append(('X', 'mandatory record'))
+            records.append((b'X', b'mandatory record'))
         if opts.get('advisory'):
-            records.append(('x', 'advisory record'))
+            records.append((b'x', b'advisory record'))
         ms._writerecords(records)