# HG changeset patch # User Christian Ebert # Date 1281775334 -3600 # Node ID 0970d7c7ff423e499d11761a0fc8ac21923c4cd9 # Parent cd294ce45931bba6c0bb044824b8cf39afe2178c# Parent ca11c8128f0820280fc2b241a20aec9d227842bd Merge after backout diff -r cd294ce45931 -r 0970d7c7ff42 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