log

age author description
Wed, 14 Dec 2005 22:19:03 -0600 Benoit Boissinot abort when merging two heads and repository has local changes
Wed, 14 Dec 2005 22:12:18 -0600 Matt Mackall Merge http://sh0n.net/jeffpc/repos/hg-gitweb/