Merge after backout stable
authorChristian Ebert <blacktrash@gmx.net>
Sat, 14 Aug 2010 09:42:14 +0100
branchstable
changeset 779 0970d7c7ff42
parent 777 cd294ce45931 (current diff)
parent 778 ca11c8128f08 (diff)
child 780 4c37b26c549c
Merge after backout
tests/test-keyword.out
--- a/tests/test-keyword.out	Thu Aug 12 14:53:34 2010 +0900
+++ b/tests/test-keyword.out	Sat Aug 14 09:42:14 2010 +0100
@@ -181,7 +181,7 @@
 record change 2/2 to 'a'? [Ynsfdaq?] 
 % a should be clean
 C a
-rolling back to revision 2 (undo commit)
+rolling back to revision 3 (undo commit)
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % init --mq
 % qimport