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