# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1247268351 -7200
# Node ID d20f53be425619981545dee80ad9eb414d8e4373
# Parent  671543b933458cba778486b0047d29c5ebede90d# Parent  f9e8e4992b7ead654c777895d607f8a7c8b78ac5
Merge with stable

diff -r 671543b93345 -r d20f53be4256 tests/test-keyword.out
--- 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