log tests/test-simplemerge-cmd.out @ 4952:8c294ee7047e

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