log tests/test-merge4.out @ 814:0902ffece4b4

age author description
Sat, 30 Jul 2005 09:00:14 -0800 mpm Merge with BOS
Sat, 30 Jul 2005 08:35:29 -0800 mpm Merge with TAH
Fri, 29 Jul 2005 15:21:02 +0100 Thomas Arendsen Hein Updated output of tests.
Thu, 21 Jul 2005 15:05:17 -0500 mpm Update tests to use commit -m and default -u
Tue, 21 Jun 2005 19:19:39 -0800 mpm [PATCH] Removal of a file added by merging branches