首先下载并安装pandoc,以Windows为例
https://cowtransfer.com/s/95c61f7c4e4548
修改本地Git安装目录下etc/gitconfig文件,增加如下配置:
[diff "pandoc"]
textconv=pandoc --to=markdown
prompt = false
[alias]
wdiff = diff --word-diff=color --unified=1
修改安装目录下etc/gitattributes
*.doc diff=pandoc
*.DOC diff=astextplain
*.docx diff=pandoc
git wdiff test2.doc,如下图: