hgbook: en/examples/hook.msglen.run.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
children

rev	line source
bos@144	1 $ \textbf{cat .hg/hgrc}
bos@144	2 [hooks]
bos@144	3 pretxncommit.msglen = test `hg tip --template \{desc\} \| wc -c` -ge 10
bos@144	4 $ \textbf{echo a > a}
bos@144	5 $ \textbf{hg add a}
bos@144	6 $ \textbf{hg commit -A -m 'too short'}
bos@144	7 abort: pretxncommit.msglen hook exited with status 1
bos@144	8 transaction abort!
bos@144	9 rollback completed
bos@144	10 $ \textbf{hg commit -A -m 'long enough'}