--- a/tests/test-uncommit.t	Thu Feb 11 15:11:10 2021 -0800
+++ b/tests/test-uncommit.t	Wed Apr 28 08:48:10 2021 -0700
@@ -410,7 +410,7 @@
   [20]
 
   $ hg uncommit --config experimental.uncommitondirtywdir=True
-  abort: cannot uncommit while merging
+  abort: cannot uncommit changesets while merging
   [20]
 
   $ hg status