DiffにWInMergeを使う
設定
git config --global merge.tool WinMerge
git config --global mergetool.WinMerge.cmd "\"C:\Program Files (x86)\WinMerge\WinMergeU.exe\" -e -u -dl \"Base\" -dr \"Mine\" \"$LOCAL\" \"$REMOTE\""
git config --global mergetool.prompt false
.gitconfig
[merge]
tool = WinMerge
[mergetool "WinMerge"]
cmd = \"C:\\Program Files (x86)\\WinMerge\\WinMergeU.exe\" -e -u -dl \"Base\" -dr \"Mine\" \"\" \"\"
[mergetool]
prompt = false
参考
WinMerge オプション
http://manual.winmerge.org/Command_line.html