diff -r 7a90fddb13b0 -r c4dbbaecaad3 tests/test-commit-amend.t
--- a/tests/test-commit-amend.t	Thu Feb 11 15:11:10 2021 -0800
+++ b/tests/test-commit-amend.t	Wed Apr 28 08:48:10 2021 -0700
@@ -406,7 +406,7 @@
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci --amend
-  abort: cannot amend while merging
+  abort: cannot amend changesets while merging
   [20]
   $ hg ci -m 'merge'