Merging Word docx files js error

Hello,

On a Word docx document with a conflict mark, when I select the Edit
Conflicts option, I get such error:

Windows Script Host
Script: C:\Program Files\TortoiseSVN\Diff-Scripts\merge-docx.js
Line: 68
Char: 2
Error: The file appears to be corrupted.
Code: 800A16A0
Source: Microsoft Word.

Here's the screenshot:
<img src="http://tortoisesvn.googlegroups.com/web/word_merge_error.png?
gda=rUmAcUYAAAA6MNbWxJTHMZM2NMD51txLbOX0A8kJ9Ur9JybClJ9yXFG-
MxmCTk49FTaXD7i_CLx3riz0RlMs_1ov_iNdB7P8E-
Ea7GxYMt0t6nY0uV5FIQ&gsc=ehmuKhYAAAAL_94rnJvHHVOodgk-s7vUk-
BdbUbR9ixVt8TXtTugTQ">

Could anyone help? I have the latest version of TortoiseSVN, but this
is also happening with 1.5.3. Tried this on three machines, on two of
them I get this error, on the other one it works fine.

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-04-21 20:39:08 CEST