# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1283275108 -3600
# Node ID a9331f9561dd15d211f22562526b36b38e9dc0f9
# Parent  77154fe0e3a50d0fe3b9155ce780212d91055465# Parent  5a41673d33fb3dbe1be82fc20689b40f5722e1c2
Merge with stable

diff -r 77154fe0e3a5 -r a9331f9561dd tests/test-keyword.t
--- a/tests/test-keyword.t	Mon Aug 16 01:01:41 2010 +0100
+++ b/tests/test-keyword.t	Tue Aug 31 18:18:28 2010 +0100
@@ -331,9 +331,10 @@
 
 Diff remaining chunk
 
-  $ hg diff | grep -v 'b/a'
+  $ hg diff
   diff -r d17e03c92c97 a
   --- a/a	Wed Dec 31 23:59:51 1969 -0000
+  \+\+\+ b/a	.*
   @@ -2,3 +2,4 @@
    foo
    do not process $Id:
@@ -474,9 +475,10 @@
 
 Diff specific revision
 
-  $ hg diff --rev 1 | grep -v 'b/c'
+  $ hg diff --rev 1
   diff -r ef63ca68695b c
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+  \+\+\+ b/c	.*
   @@ -0,0 +1,3 @@
   +expand $Id$
   +do not process $Id: