log tests/test-simplemerge-cmd.out @ 9899:be574a37a8ae stable

age author description
Sun, 17 May 2009 01:16:56 +0200 Marti Raudsepp tests: use repr.py to avoid binary characters in test output
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