Using Microsoft Word with Git

[petebachant]

Inspired by this blog post, I recently installed TortoiseGit on Windows and had some mild success dealing with merge conflicts in Word documents. When a conflict is detected, Word's built-in compare/merge tool is pulled up to resolve it. Command line diffing worked pretty well too.

Unfortunately, TortoiseGit is only available for Windows, but it is open-source, so maybe the relevant parts could be ported elsewhere. The diff and merge scripts appear to be JavaScript: https://github.com/TortoiseGit/TortoiseGit/tree/master/contrib/diff-scripts