Changing the style git uses for merge conflicts
Changing the style git uses for merge conflicts

Inspired by a [comment on
quora](http://www.quora.com/Git-revision-control/How-does-git-merge-work)
by Anders Kaseorg.

gkb/gh-dot-files