diff bin/git-conflict @ 171:1e77456c253b

Fixes to vimrc
author zegervdv <zegervdv@me.com>
date Mon, 03 Nov 2014 19:46:48 +0100
parents faf7781dae42
children
line wrap: on
line diff