--- a/tests/test-histedit-non-commute-abort.t	Tue Sep 28 09:25:05 2021 -0700
+++ b/tests/test-histedit-non-commute-abort.t	Tue Sep 28 09:32:24 2021 -0700
@@ -160,7 +160,7 @@
   $ hg histedit e860deea161a
   c: untracked file differs
   abort: untracked files in working directory conflict with files in 055a42cdd887
-  [255]
+  [20]
 
 We should have detected the collision early enough we're not in a
 histedit state, and p1 is unchanged.