Mercurial > hgbook
log en/examples/tour-merge-conflict.cousin.out @ 525:e5739e8d708f
age | author | description |
---|---|---|
Wed, 20 Aug 2008 22:00:46 +0200 | Guido Ostkamp | Fix sample output for test 'tour-merge-conflict'. |
Tue, 06 Mar 2007 21:44:56 -0800 | Bryan O'Sullivan | Add expected output files. |