Diagram colors

This is a revamp of https://github.com/mhagger/git-imerge/pull/7 with the changes you suggested.