log tests/test-merge6.out @ 793:445970ccf57a

age author description
Fri, 29 Jul 2005 06:43:21 +0100 Thomas Arendsen Hein Merge with upstream
Tue, 26 Jul 2005 19:23:59 -0800 mpm Fix up test results
Thu, 21 Jul 2005 15:05:17 -0500 mpm Update tests to use commit -m and default -u