comparison templates/map @ 1674:dee55c4a4963

abort when using 'update -m' and this is not a merge add more testcases for updating with local changes
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Wed, 01 Feb 2006 08:46:24 +0100
parents e8a3df8b62b3
children 4b1e0dc913bf
comparison
equal deleted inserted replaced
1667:daff3ef0de8d 1674:dee55c4a4963