$ cat ~/.gitconfig [merge] tool = WinMerge [mergetool "WinMerge"] cmd = \"C:/Program Files/WinMerge/WinMergeU.exe\" //r //e //u //wl //wr \"$LOCAL\" \"$MERGED\" \"$REMOTE\"
参考サイトの記載だと保存が微妙だったので変更
参考
http://takanosho.wordpress.com/2012/12/25/git-merge-tool-using-winmerge/