Merge problem

Hello

I have a problem with svn update. Some files are
automatically merged. But some french character like
"é" or "è" are changes by strange char.

So I have two questions:
- Is it possible to desactivate automatic merge, and
to say that every file modified by someone that i have
modified too are conflicted ?
- Is there a way not to change "é" or "è" or ...
during merge ?

Barry

        
                
Vous manquez d’espace pour stocker vos mails ?
Yahoo! Mail vous offre GRATUITEMENT 100 Mo !
Créez votre Yahoo! Mail sur http://fr.benefits.yahoo.com/

Le nouveau Yahoo! Messenger est arrivé ! Découvrez toutes les nouveautés pour dialoguer instantanément avec vos amis. A télécharger gratuitement sur http://fr.messenger.yahoo.com

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Oct 26 14:33:17 2004