diff bin/git-conflict @ 131:ccee6e9f0c1d

fix colors in terminal vim
author zegervdv <zegervdv@me.com>
date Thu, 02 Oct 2014 08:20:44 +0200
parents faf7781dae42
children
line wrap: on
line diff