Mercurial > hgbook
comparison en/hgbook.css @ 401: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, 20 Aug 2008 22:00:46 +0200 |
parents | 914babdc99c8 |
children |
comparison
equal
deleted
inserted
replaced
400:c36a6f534b99 | 401:e281bd9a8e47 |
---|