hgbook
diff en/examples/hook.ws.better.out @ 275:96ea24a916f9
Merge with myself.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Mon Nov 26 20:42:36 2007 -0800 (2007-11-26) |
parents | 06d18465df03 |
children |
line diff
1.1 --- a/en/examples/hook.ws.better.out Mon Mar 26 22:45:48 2007 -0700 1.2 +++ b/en/examples/hook.ws.better.out Mon Nov 26 20:42:36 2007 -0800 1.3 @@ -5,13 +5,13 @@ 1.4 $ \textbf{hg commit -A -m 'add new line with trailing whitespace'} 1.5 a, line 2: trailing whitespace added 1.6 commit message saved to .hg/commit.save 1.7 -abort: pretxncommit.whitespace hook exited with status 1 1.8 transaction abort! 1.9 rollback completed 1.10 +abort: pretxncommit.whitespace hook exited with status 1 1.11 $ \textbf{sed -i 's, *$,,' a} 1.12 $ \textbf{hg commit -A -m 'trimmed trailing whitespace'} 1.13 a, line 2: trailing whitespace added 1.14 commit message saved to .hg/commit.save 1.15 -abort: pretxncommit.whitespace hook exited with status 1 1.16 transaction abort! 1.17 rollback completed 1.18 +abort: pretxncommit.whitespace hook exited with status 1