log tests/test-up-local-change @ 1641:1ef060ae7966

age author description
Wed, 14 Dec 2005 22:19:03 -0600 Benoit Boissinot abort when merging two heads and repository has local changes
Sat, 20 Aug 2005 13:08:07 -0700 mpm Merge with jeffpc
Fri, 19 Aug 2005 16:45:25 -0800 mpm Merge with TAH