merge-doc.js: Merge document in word >=2010 leaves three open windows
What steps will reproduce the problem?
- Create a merge conflict on one .docx file, after clicking the "resolve" button, right click on the link and select "Edit conflicts"
- The merged Word document opens. In Word >= Office 2010 the script leaves several open documents.
What is the expected output? What do you see instead? The script should only leave one window open: The one with the merged and compared documents.
Three windows are left open instead.
What version of TortoiseGit and Git are you using? On what operating system?
TortoiseGit 2.5.0.0 (C:\Program Files\TortoiseGit\bin) git version 1.9.5.msysgit.1 (C:\Program Files\Git\bin; C:\Program Files\Git; C:\Program Files\Git\etc\gitconfig; C:\ProgramData\Git\config)
Windows 7, Office 2010
Please provide any additional information below.
I have an updated script that fixes the issue but I can't find a way to submit a merge request (no "new merge request" button available?).
See also issues #3085 (closed) and #3084 (closed)
To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information