hgbook
diff en/examples/template.svnstyle.template.out @ 302:e281bd9a8e47
Fix sample output for test 'tour-merge-conflict'.
Fix test itself as well (now requires 'hg resolve').
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 diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/en/examples/template.svnstyle.template.out Wed Aug 20 22:00:46 2008 +0200 1.3 @@ -0,0 +1,6 @@ 1.4 +$ \textbf{cat svn.template} 1.5 +r\{rev\} | \{author|user\} | \{date|isodate\} (\{date|rfc822date\}) 1.6 + 1.7 +\{desc|strip|fill76\} 1.8 + 1.9 +------------------------------------------------------------------------