diff bin/git-conflict @ 81:044395254e27

Update gitconfig
author zegervdv <zegervdv@me.com>
date Sun, 27 Jul 2014 20:10:51 +0200
parents faf7781dae42
children
line wrap: on
line diff