Hello Stefan,
In addition to my previous reply: Word 2007 is installed on all
machines. On the machine where merge works, TortoiseSVN 1.5.3 is
installed, on both machines where merge does not work TortoiseSVN
1.6.1 is installed. We have tried to install version 1.5.3 on the
other two machines but got the same error, we also tried to copy
scripts from the machine where it works and got the error again.
On Apr 21, 11:03 pm, Stefan Küng <tortoise..._at_gmail.com> wrote:
> Alex Kokoshyn wrote:
> > 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.
>
> What version of office do you have installed where it doesn't work? What
> version of office is it where it works?
>
> Stefan
>
> --
> ___
> oo // \\ "De Chelonian Mobile"
> (_,\/ \_/ \ TortoiseSVN
> \ \_/_\_/> The coolest Interface to (Sub)Version Control
> /_/ \_\ http://tortoisesvn.net
>
> ------------------------------------------------------http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMess...
>
> To unsubscribe from this discussion, e-mail: [users-unsubscr..._at_tortoisesvn.tigris.org].
>
> signature.asc
> < 1KViewDownload
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1856115
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-04-22 09:15:27 CEST
