diff bin/git-conflict @ 209:945ce864a4e9

Add support for local vimrcs
author zegervdv <zegervdv@me.com>
date Tue, 25 Nov 2014 20:28:15 +0100
parents faf7781dae42
children
line wrap: on
line diff