[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

[TSVN] Usage/Integration of Diff scripts?

From: Reinhard Brandstaedter <reinhard.brandstaedter_at_ams-engineering.com>
Date: 2005-07-21 14:47:57 CEST


I've seen that there is a feature to create customized diff scripts
(which is really cool). I'm very interested in that feature because it
would mean I can develop own scripts for our needs.
I just beginning to play around with that and I'm trying to use the
Word/OO diff/merge scripts.
I see that the diff of word files is called fromt he tortoise context
menu with the normal diff/merge command if you set proper application
handlers for the extensions.

Now I've tried to merge a conflicted word (Word 2002) file but all i get
is a file with garbage in it when it's displayed in word.
Is there any conversion made on the file when it's opened/in a
conflicted state?


To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Thu Jul 21 14:48:17 2005

This is an archived mail posted to the TortoiseSVN Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.