[.gitconfig] diff.tool=vimdiff
[.gitconfig] difftool.prompt = false / alias dt = difftool
Merge remote-tracking branch 'origin/master' into powerline