Merge with crew-stable, fix test output

Merge with crew-stable, fix test output

--- a/tests/test-merge-internal-tools-pattern.out	Mon Apr 14 23:04:34 2008 +0200
+++ b/tests/test-merge-internal-tools-pattern.out	Mon Apr 14 23:28:50 2008 +0200
@@ -9,9 +9,7 @@
 created new head
 # merge using internal:fail tool
 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-There are unresolved merges, you can redo the full merge using:
-  hg update -C 2
-  hg merge 1
+use 'hg resolve' to retry unresolved file merges
 line 1
 line 2
 third line