--- a/tests/test-commit-unresolved.t	Fri Mar 04 19:21:12 2011 -0600
+++ b/tests/test-commit-unresolved.t	Sun Mar 06 15:21:50 2011 +0100
@@ -38,7 +38,7 @@
 
   $ echo "ABCD" > A
   $ hg commit -m "Merged"
-  abort: unresolved merge conflicts (see hg resolve)
+  abort: unresolved merge conflicts (see hg help resolve)
   [255]
 
 Mark the conflict as resolved and commit