Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Sat, 11 Jul 2009 01:25:51 +0200
changeset 619 d20f53be4256
parent 617 671543b93345 (current diff)
parent 618 f9e8e4992b7e (diff)
child 620 04781aad754a
Merge with stable
--- a/tests/test-keyword.out	Fri Jul 10 12:40:24 2009 +0200
+++ b/tests/test-keyword.out	Sat Jul 11 01:25:51 2009 +0200
@@ -210,6 +210,7 @@
 +$Id$
 +tests for different changenodes
 % qpop
+popping mqtest.diff
 patch queue now empty
 % qgoto - should imply qpush
 applying mqtest.diff
@@ -218,6 +219,7 @@
 $Id: c,v 40a904bbbe4c 1970/01/01 00:00:01 user $
 tests for different changenodes
 % qpop and move on
+popping mqtest.diff
 patch queue now empty
 % copy
 % kwfiles added