diff bin/git-conflict @ 231:49fd5ea356f0

Reset colorscheme
author zegervdv <zegervdv@me.com>
date Fri, 23 Jan 2015 18:43:01 +0100
parents faf7781dae42
children
line wrap: on
line diff