Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Tue, 19 May 2009 05:48:42 +0200
changeset 546 3fbd03b215e6
parent 544 492234da500b (current diff)
parent 545 c937a2e35411 (diff)
child 548 b7b183546a15
Merge with stable
--- 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