add executable bit to diffconflicts
git default difftool is vimdiff
Add solarized dircolors