log tests/test-merge1.out @ 1581:db10b7114de0

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
Tue, 16 Aug 2005 19:03:01 -0800 mpm run-tests: remove '+ hg' trick