log en/examples/tour-merge-conflict.merge.out @ 433:83790457e85b

age author description
Sat, 18 Oct 2008 12:07:16 -0500 jerojasro modifications to generate the examples for the book
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.