Mercurial > hgbook
changeset 169:f4a50cf01d13
Merge.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Mon, 26 Mar 2007 23:21:12 -0700 |
parents | f8b5b782e150 (current diff) e67251ac336f (diff) |
children | 9cd856b4bd21 |
files | |
diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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