hgbook
view en/examples/template.simple.simplest.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 |