hgbook

diff en/examples/hook.ws.better.out @ 179:5fc4a45c069f

Continue documentation of collaboration models.
author Bryan O'Sullivan <bos@serpentine.com>
date Fri Mar 30 23:05:28 2007 -0700 (2007-03-30)
parents 8cf40d4d9377
children 00f69e8825c5
line diff
     1.1 --- a/en/examples/hook.ws.better.out	Thu Mar 08 23:11:55 2007 -0800
     1.2 +++ b/en/examples/hook.ws.better.out	Fri Mar 30 23:05:28 2007 -0700
     1.3 @@ -8,9 +8,9 @@
     1.4  abort: pretxncommit.whitespace hook exited with status 1
     1.5  transaction abort!
     1.6  rollback completed
     1.7 -$ \textbf{perl -pi -e 's,\textbackslash{}s+$,,' a}
     1.8 +$ \textbf{sed -i 's, *$,,' a}
     1.9  $ \textbf{hg commit -A -m 'trimmed trailing whitespace'}
    1.10 -a, line 1: trailing whitespace added
    1.11 +a, line 2: trailing whitespace added
    1.12  commit message saved to .hg/commit.save
    1.13  abort: pretxncommit.whitespace hook exited with status 1
    1.14  transaction abort!