Does docx merging in TortoiseSVN work?

Question

I'm trying to use some scripts that came from TortoiseSVN to do some docx merges, but the script doesn't seem to be working right. Has anybody used this feature in TortoiseSVN? How does it normally work?

Answer 1

I use TortoiseSVN 1.6.6 and docx merge is working fine. Check SVN settings -> Diff Viewer -> Advanced ...

There is a table of mime-type spicific programs. For docx I see "wscript.exe "C:\Program Files\TortoiseSVN\Diff-Scripts\diff-docx.js" %base %mine //E:javascript".