Bryan O'Sullivan avatar Bryan O'Sullivan committed f4a50cf Merge

Merge.

Comments (0)

Files changed (2)

en/examples/hook.ws

 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
 

en/examples/hook.ws.simple.out

 $ \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
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.