diff -r 768056549737 -r dc00324e80f4 tests/test-largefiles.t
--- a/tests/test-largefiles.t	Fri Jan 29 12:16:55 2021 -0800
+++ b/tests/test-largefiles.t	Fri Jan 29 15:56:08 2021 -0800
@@ -1751,7 +1751,7 @@
   $ hg rm sub2/large6
   $ hg up -r.
   abort: outstanding uncommitted merge
-  [255]
+  [20]
 
 - revert should be able to revert files introduced in a pending merge
   $ hg revert --all -r .