diff bin/git-conflict @ 32:2da8d8daa033

Add remaps to vim and aliases to zsh
author zegervdv <zegervdv@me.com>
date Fri, 04 Apr 2014 18:12:59 +0200
parents faf7781dae42
children
line wrap: on
line diff