log en/examples/tour-merge-conflict @ 333:db3aa48f2f73

age author description
Tue, 06 Mar 2007 20:46:07 -0800 Bryan O'Sullivan Add local regexps to ignore bits of output.
Thu, 19 Oct 2006 15:18:07 -0700 Bryan O'Sullivan More merge content.