log tests/test-simplemerge-cmd.out @ 7725:6a888d491eaf

age author description
Tue, 07 Aug 2007 10:24:33 +0200 Thomas Arendsen Hein Remove trailing spaces
Mon, 16 Apr 2007 20:17:39 -0300 Alexis S. L. Carvalho polish the simplemerge command; add a test