# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1318029875 -3600
# Node ID 0f5e2d5e716babcd9b3f6666644f0db5ee7dd5bf
# Parent  639bb4617c704de72f61591be8563361c79634a7# Parent  d60568a6946505b2454c47f413f0a59293169d0b
Merge with stable

diff -r 639bb4617c70 -r 0f5e2d5e716b tests/test-keyword.t
--- 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