feat(git): Add difftool script
feat(git): Add difftool script

http://vim.wikia.com/wiki/A_better_Vimdiff_Git_mergetool
https://raw.githubusercontent.com/whiteinge/dotfiles/master/bin/diffconflicts

defrank/dotfiles,defrank/dotfiles