log tests/simple-merge @ 52:c78eea339e8b

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