Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Sat, 08 Oct 2011 00:24:35 +0100
changeset 986 0f5e2d5e716b
parent 982 639bb4617c70 (current diff)
parent 985 d60568a69465 (diff)
child 988 320bd57f76a3
Merge with stable
--- a/tests/test-keyword.t	Sat Sep 10 13:23:41 2011 +0100
+++ b/tests/test-keyword.t	Sat Oct 08 00:24:35 2011 +0100
@@ -825,7 +825,7 @@
   ignore $Id$
 
   $ hg rollback
-  repository tip rolled back to revision 2 (undo commit)
+  repository tip rolled back to revision 2 (undo import)
   working directory now based on revision 2
   $ hg update --clean
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved