Using TortoiseMerge with Delphi forms (ext .dfm)

Hello,
 
I am developping with Delphi, and I have conflicts between 2 versions. I can solve them one by one using Tortoise Merge, but I have a serious problem with Delphi forms (extension .dfm): In some case everything goes as normal and I can modify, and in some cases I have the message: "The file is not a valid text file! Not that UTF16 and UTF32 are treated as binary too".
 
Why does it work in some cases and not in others? How to identify the problem? How to solve it ?
 
Thanks a lot
 
Laurent
 
 

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Mon Sep 18 17:02:55 2006