hgbook
changeset 169:f4a50cf01d13
Merge.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Mon Mar 26 23:21:12 2007 -0700 (2007-03-26) |
parents | f8b5b782e150 e67251ac336f |
children | 9cd856b4bd21 |
files |
line diff
1.1 --- a/en/examples/hook.ws Mon Mar 26 23:20:59 2007 -0700 1.2 +++ b/en/examples/hook.ws Mon Mar 26 23:21:12 2007 -0700 1.3 @@ -3,7 +3,7 @@ 1.4 hg init a 1.5 cd a 1.6 echo '[hooks]' > .hg/hgrc 1.7 -echo "pretxncommit.whitespace = hg export tip | (! grep -qP '^\\+.*[ \\t]$')" >> .hg/hgrc 1.8 +echo "pretxncommit.whitespace = hg export tip | (! egrep -q '^\\+.*[ \\t]$')" >> .hg/hgrc 1.9 1.10 #$ name: simple 1.11
2.1 --- a/en/examples/hook.ws.simple.out Mon Mar 26 23:20:59 2007 -0700 2.2 +++ b/en/examples/hook.ws.simple.out Mon Mar 26 23:21:12 2007 -0700 2.3 @@ -1,6 +1,6 @@ 2.4 $ \textbf{cat .hg/hgrc} 2.5 [hooks] 2.6 -pretxncommit.whitespace = hg export tip | (! grep -qP '^\textbackslash{}+.*[ \textbackslash{}t]$') 2.7 +pretxncommit.whitespace = hg export tip | (! egrep -q '^\textbackslash{}+.*[ \textbackslash{}t]$') 2.8 $ \textbf{echo 'a ' > a} 2.9 $ \textbf{hg commit -A -m 'test with trailing whitespace'} 2.10 adding a