--- a/tests/test-conflict.t	Fri Jan 14 08:44:36 2022 -0800
+++ b/tests/test-conflict.t	Fri Jan 14 09:28:44 2022 -0800
@@ -404,7 +404,7 @@
   1 other heads for branch "default"
   $ hg merge --tool :merge-local
   merging a
-  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  1 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ cat a
   Start of file