log tests/test-up-local-change @ 1914:a5bf0030df5f

age author description
Wed, 01 Feb 2006 08:46:24 +0100 Benoit Boissinot abort when using 'update -m' and this is not a merge