Adds diffconflicts command
Adds diffconflicts command to mergetools
First attempt at solarized colors in gitk