Resolve conflict on MS Word (97-1003) merge-doc.js error

Hi.

I got a conflict on 3 MS Word (97-2003) files after a merge. Trying to
resolve one conflict, MS Word 2010 opened 3 windows of the same file
(distinct revisions). Them I received the following error and no idea how
to resolve it.

---------------------------
Windows Script Host
---------------------------
Script: C:\Program Files\TortoiseSVN\Diff-Scripts\merge-doc.js
Linha: 100
Caract.: 5
Erro: O método ou a propriedade Compare não está disponível porque a
seleção atual está bloqueada para edição.
Código: 800A11FD
Origem: Microsoft Word

---------------------------
OK
---------------------------

Line: 100
Error: The Compare method or property is not available because the current
selection is locked for editing.
Code: 800A11FD

I'm using:
Windows 8.1 OS 64 bits (pt-BR)
TortoiseSVN 1.8.10 (en)
Subversion 1.8.11
MS Office 2010
The MS Word file is 97/2003 .doc

Merge tool command line for .doc extension:
wscript.exe "C:\Program Files\TortoiseSVN\Diff-Scripts\merge-doc.js"
%merged %theirs %mine %base //E:javascript

I got newest merge-doc.js file but it only change the line of error to 104.

Thanks for any help.

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2015-02-24 18:51:31 CET