Code

Colorize merge commit diffs as well