hgbook

view en/examples/hook.simple.ext.out @ 302:e281bd9a8e47

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
line source
1 $ \textbf{echo 'commit.when = echo -n "date of commit: "; date' >> .hg/hgrc}
2 $ \textbf{echo a >> a}
3 $ \textbf{hg commit -m 'i have two hooks'}
4 committed