fornever / extdiff Goto Github PK

Word has a "Merge" or "Combine" mode as well diff/compare (at least in the latest versions).

Propose extending the tool to accept a merge mode in addition to diff which will use the Word Combine mode instead of Compare. This appears to accept multiple files so it could be either 2 or 3-way merge (thus could be easily configured to work with git in the same way diff is).

Here is a Microsoft page explaining how to use the Merge function. Wouldn't it be nice if MS had command-line arguments for these functions?

Would you know if Diff-Word.ps1 can be modified to allow for this to work in Mac OS?

Have you tried integrating this with git as a diff tool?

I'm considering trying it out, as I would like to do version control with word files.
I'm looking at how to do it on Stack Overflow
It would be very useful for me.

Whe using script to open compare window, the ribbon panel is freezin, cant click any button in it etc. After window resize os window switch focus the panel unfreez.

I had to add change ActiveWindow.WindowState to normal/max and back to work it around.

Per the readme, the expected PowerShell call syntax is as follows:
powershell -File Diff-Word.ps1 oldfile.docx newfile.docx
However, the result is the opposite: Word treats newfile as the original and oldfile as the updated. This is because the Word command Document.Compare expects the syntax NewDocument.Compare(OldDocument, ...) but the PowerShell script uses OldDocument.Compare(NewDocument, ...) which explains the inverted result in Word. Unfortunately the correct syntax is very unclear in the Microsoft documentation so the confusion is quite understandable. However, the PowerShell script should align with the correct use of the Word command.

At the moment, you must configure each repository to pass the diff to ms word, since you need to copy the .gitattributes file in the repository.

However, there is a possibility to make it available globally for all projects of a user. You can copy the .gitattributes file into the user's home directory instead into your projects root directory. Git need to know the location of that file. You can set it and check if the path is correctly expanded to the location where you copied the .gitattributes file:

git config --global core.attributesfile ~/.gitattributes
git config --global core.attributesfile

I suggest to update the README.MD to help also user's who are inexperienced with git.

Thanks by the way for that really cool tool.