diff -r bb1a988ef4a5 -r a736ab681b78 tests/failfilemerge.py
--- a/tests/failfilemerge.py	Tue Oct 06 21:06:18 2020 -0700
+++ b/tests/failfilemerge.py	Thu Oct 08 15:35:44 2020 -0700
@@ -12,7 +12,7 @@
 def failfilemerge(
     filemergefn, premerge, repo, wctx, mynode, orig, fcd, fco, fca, labels=None
 ):
-    raise error.Abort("^C")
+    raise error.Abort(b"^C")
     return filemergefn(premerge, repo, mynode, orig, fcd, fco, fca, labels)