# HG changeset patch
# User Bryan O'Sullivan <bos@serpentine.com>
# Date 1174976472 25200
# Node ID f4a50cf01d13a19120cb54a20240fbd5465ec1da
# Parent  f8b5b782e150961e392b0fef9f16d3be7da9f922# Parent  e67251ac336fa0aedf51ffa5cfe0c5b591dfb807
Merge.

diff -r f8b5b782e150 -r f4a50cf01d13 en/examples/hook.ws
--- a/en/examples/hook.ws	Mon Mar 26 23:20:59 2007 -0700
+++ b/en/examples/hook.ws	Mon Mar 26 23:21:12 2007 -0700
@@ -3,7 +3,7 @@
 hg init a
 cd a
 echo '[hooks]' > .hg/hgrc
-echo "pretxncommit.whitespace = hg export tip | (! grep -qP '^\\+.*[ \\t]$')" >> .hg/hgrc
+echo "pretxncommit.whitespace = hg export tip | (! egrep -q '^\\+.*[ \\t]$')" >> .hg/hgrc
 
 #$ name: simple
 
diff -r f8b5b782e150 -r f4a50cf01d13 en/examples/hook.ws.simple.out
--- a/en/examples/hook.ws.simple.out	Mon Mar 26 23:20:59 2007 -0700
+++ b/en/examples/hook.ws.simple.out	Mon Mar 26 23:21:12 2007 -0700
@@ -1,6 +1,6 @@
 $ \textbf{cat .hg/hgrc}
 [hooks]
-pretxncommit.whitespace = hg export tip | (! grep -qP '^\textbackslash{}+.*[ \textbackslash{}t]$')
+pretxncommit.whitespace = hg export tip | (! egrep -q '^\textbackslash{}+.*[ \textbackslash{}t]$')
 $ \textbf{echo 'a ' > a}
 $ \textbf{hg commit -A -m 'test with trailing whitespace'}
 adding a