log tests/test-merge1 @ 1879:9ef0850b9b68

age author description
Wed, 14 Dec 2005 22:19:03 -0600 Benoit Boissinot abort when merging two heads and repository has local changes
Tue, 13 Sep 2005 18:38:27 -0500 mpm Fix bug with co -C across branches, update tests
Sat, 30 Jul 2005 09:00:14 -0800 mpm Merge with BOS