diff bin/git-conflict @ 220:922772b646ce

update gitconfig
author zegervdv <zegervdv@me.com>
date Wed, 24 Dec 2014 17:34:34 +0100
parents faf7781dae42
children
line wrap: on
line diff