Merge Reintegrate conflicted Excel files?

I'm trying to do a merge reintegrate and most of it is working OK. However, I have some Excel files in there that I have under svn. I made changes to them in my branch. Some of them are merging OK but others are giving messages like:

Conflicted: C:\Documents and Settings\bri7744\My Documents\CLOC_Remedy_RCIP\7083\bin\Templates\7083 Exec NTF.xls

My questions:

1. Does TSVN treat Excel as binary or text?
2. If binary, what does it mean for it to be conflicted?

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2938383

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2012-03-21 20:53:18 CET