# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1242704922 -7200
# Node ID 3fbd03b215e658d0453e3e2459f10fafe556d93f
# Parent  492234da500baa7b77efabd8f279e957c3e8c544# Parent  c937a2e35411eb1b492418278e747b844be2afbf
Merge with stable

diff -r 492234da500b -r 3fbd03b215e6 tests/test-keyword.out
--- a/tests/test-keyword.out	Fri May 15 01:37:50 2009 +0200
+++ b/tests/test-keyword.out	Tue May 19 05:48:42 2009 +0200
@@ -112,10 +112,6 @@
 A b
 % default keyword expansion including commit hook
 % interrupted commit should not change state or run commit hook
-a
-b
-transaction abort!
-rollback completed
 abort: empty commit message
 % status
 A a
@@ -281,8 +277,6 @@
 ignore $Id$
 a
 % interrupted commit should not change state
-transaction abort!
-rollback completed
 abort: empty commit message
 % status
 M a