git の差分比較・マージを WinMerge で行う

git diff でWinMergeを呼び出す

参照URL

追記

上記ブログを参考に、~/.gitconfigを以下のように設定

$ cat ~/.gitconfig
[user]
        name = xxx
        email = [e-mail]
[core]
        editor = code --wait
        pager = less -F -X
[alis]
        co = commit
        ci = commit
[alias]
        st = status
        br = branch
        co = checkout
        ci = commit
[pull]
        rebase = true
[diff]
        tool = WinMerge
[difftool "WinMerge"]
        path = C:/Program Files/WinMerge/WinMergeU.exe
[difftool]
        prompt = false
[merge]
        tool = WinMerge
[mergetool "WinMerge"]
        path = C:/Program
[mergetool]
        prompt = false

これで「git difftool」コマンドをたたくことで、GUI diffツールのWinMergeで差分が表示される。