hgbook

log en/examples/tour-merge-conflict

age author description
2008-08-20 Guido Ostkamp Fix sample output for test 'tour-merge-conflict'.