log tests/test-simplemerge-cmd.out @ 5018:c7623d2b2a66

age author description
Mon, 16 Apr 2007 20:17:39 -0300 Alexis S. L. Carvalho polish the simplemerge command; add a test