log tests/simple-merge @ 28:9f64ee817199

age author description
Wed, 04 May 2005 22:57:51 -0800 mpm Add some tests to the repo