mhagger/git-imerge — pull request #12 by jherland (2013-05-20 16:31:49+00:00)
Title: Diagram colors

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