comparison templates/map-cmdline.changelog @ 5206:6a1d2dd96b8e

abort when adding a file in merged state
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Tue, 21 Aug 2007 02:02:08 +0200
parents e3280d350792
children 3aa420c56ac4
comparison
equal deleted inserted replaced
5205:ce4e67533723 5206:6a1d2dd96b8e