Stefan Küng wrote:
> Freeman wrote:
>> Hello:
>>
>> right now we are documenting a project and decide to use OpenOffice an
>> its format, but when we have a conflict into a file, We cannot have
>> option to do a merge easily, so we experiment with a .doc extension,
>> but Tortoise says that we must have MS Office. then:
>
> *.doc (and other office extensions) are by default registered to the
> Office diff/merge scripts.
>
This is true, except later versions of diff-doc.js and diff-docx.js will
attempt to use OpenOffice.org if Microsoft Word cannot be found.
merge-doc.js and merge-docx.js do not, although they should (see a
previous email of mine:
http://svn.haxx.se/tsvnusers/archive-2008-07/0632.shtml), since the
files should be the same.
>> 1) How we can compare and resolve conflicts in ODF using Subversion
>> and Tortoise calling OOo?
>
> Settings dialog->external programs->diff viewer (or merge tool)->Advanced
> Then change the .doc extension to the same external program (script) as
> for .ods.
>
In reference to my above statement, you should not have to do this for
diffs of *.doc if you have the latest diff-scripts.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-10-27 19:44:28 CET