diff bin/git-conflict @ 11:f9f04cee7f51

Add gitignore plugin to zsh
author zegervdv <zegervdv@me.com>
date Sun, 09 Mar 2014 19:45:06 +0100
parents d35280c9b023
children faf7781dae42
line wrap: on
line diff