Re: how to solve doc / docx files in conflict ?

2008/7/23 MagicFX <magicfx0413_at_gmail.com>:
> the default diff / merge editor cannot parse ms word format
> it just treats word as a binary!
> if I wanna resolve docs rathen than plain text files
> how can i do? which diff / merge app should i use?

That's because Word docs are binary files. The only app which can diff
them is Word itself.

However, there are diff scripts installed by default which allow you
to call word to do the diff. Look at TSVN->Settings->Diff->Advanced.
That should handle .doc (and .docx in 1.5.0)

Simon

-- 
: ___
: oo // \\ "De Chelonian Mobile"
: (_,\/ \_/ \ TortoiseSVN
: \ \_/_\_/> The coolest Interface to (Sub)Version Control
: /_/ \_\ http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org