hgbook: en/examples/hook.ws.simple.out annotate

hgbook

Fix sample output for test 'tour-merge-conflict'.
Fix test itself as well (now requires 'hg resolve').

author	Guido Ostkamp <hg@ostkamp.fastmail.fm>
date	Wed Aug 20 22:00:46 2008 +0200 (2008-08-20)
parents	e67251ac336f
children

rev	line source
bos@144	1 $ \textbf{cat .hg/hgrc}
bos@144	2 [hooks]
bos@167	3 pretxncommit.whitespace = hg export tip \| (! egrep -q '^\textbackslash{}+.*[ \textbackslash{}t]$')
bos@144	4 $ \textbf{echo 'a ' > a}
bos@144	5 $ \textbf{hg commit -A -m 'test with trailing whitespace'}
bos@144	6 adding a
bos@144	7 transaction abort!
bos@144	8 rollback completed
bos@273	9 abort: pretxncommit.whitespace hook exited with status 1
bos@144	10 $ \textbf{echo 'a' > a}
bos@144	11 $ \textbf{hg commit -A -m 'drop trailing whitespace and try again'}