Diagram colors.v2

Rebased version of https://github.com/mhagger/git-imerge/pull/12