diff bin/git-conflict @ 116:f7ea2b69b89d

Add shortcut to vimrc
author zegervdv <zegervdv@me.com>
date Tue, 16 Sep 2014 14:32:28 +0200
parents faf7781dae42
children
line wrap: on
line diff