[push]
    default = simple
[core]
    autocrlf = input
[alias]
    #df = diff --ignore-space-at-eol --ignore-space-change
    # from 1.8.4
    df  = diff --ignore-space-at-eol --ignore-space-change --ignore-blank-lines

# Mac (GitHub) {{{
[user]
    name  = KazuakiM
    email = kazuaki_mabuchi_to_go@hotmail.co.jp
[difftool "vimdiff"]
    cmd = /usr/local/opt/macvim-kaoriya/bin/vimdiff -O $LOCAL $REMOTE
[mergetool "vimdiff"]
    cmd = /usr/local/opt/macvim-kaoriya/bin/vimdiff -O $LOCAL $REMOTE
#}}}
# vim:ft=gitconfig

[push]
    default = simple
[core]
    autocrlf = input
[alias]
    #df = diff --ignore-space-at-eol --ignore-space-change
    # from 1.8.4
    df  = diff --ignore-space-at-eol --ignore-space-change --ignore-blank-lines

# Mac (GitHub) {{{
[user]
    name  = KazuakiM
    email = kazuaki_mabuchi_to_go@hotmail.co.jp
[difftool "vimdiff"]
    cmd = /usr/local/bin/vimdiff -O $LOCAL $REMOTE
[mergetool "vimdiff"]
    cmd = /usr/local/bin/vimdiff -O $LOCAL $REMOTE
#}}}
# vim:ft=gitconfig

Update vimdiff path at gitconfig
 Update vimdiff path at gitconfig
