tests/test-commit-amend.t

--- a/tests/test-commit-amend.t	Fri Aug 12 06:01:42 2016 -0700
+++ b/tests/test-commit-amend.t	Fri Aug 12 05:56:40 2016 -0700
@@ -813,7 +813,7 @@
   $ hg merge -q bar --config ui.interactive=True << EOF
   > c
   > EOF
-  local changed aa which remote deleted
+  local changed aa which other deleted
   use (c)hanged version, (d)elete, or leave (u)nresolved? c
   $ hg ci -m 'merge bar (with conflicts)'
   $ hg log --config diff.git=1 -pr .