simplify git color handling
use kdiff3 for merges