log tests/test-up-local-change @ 1674:dee55c4a4963

age author description
Wed, 01 Feb 2006 08:46:24 +0100 Benoit Boissinot abort when using 'update -m' and this is not a merge
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
Thu, 18 Aug 2005 13:33:39 +0100 TK Soh test fixes for Solaris 2.6
Sat, 30 Jul 2005 09:00:14 -0800 mpm Merge with BOS