--- a/tests/test-merge1.t	Tue Oct 06 21:06:18 2020 -0700
+++ b/tests/test-merge1.t	Thu Oct 08 15:35:44 2020 -0700
@@ -360,7 +360,7 @@
   > )
   > def applyupdates(orig, *args, **kwargs):
   >     orig(*args, **kwargs)
-  >     raise error.Abort('intentional aborting')
+  >     raise error.Abort(b'intentional aborting')
   > def extsetup(ui):
   >     extensions.wrapfunction(merge, "applyupdates", applyupdates)
   > EOF