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