log tests/test-merge1.out @ 1427:0980d77f5e9a

age author description
Tue, 13 Sep 2005 18:38:27 -0500 mpm Fix bug with co -C across branches, update tests