comparison bin/git-conflict @ 225:1d9bec72b9b3

Update colors and style
author zegervdv <zegervdv@me.com>
date Wed, 21 Jan 2015 09:11:59 +0100
parents faf7781dae42
children
comparison
equal deleted inserted replaced
224:30eb5cded521 225:1d9bec72b9b3