diff bin/git-conflict @ 70:f16da34ed479

Ignore vim.lock files
author zegervdv <zegervdv@me.com>
date Sat, 28 Jun 2014 17:44:14 +0200
parents faf7781dae42
children
line wrap: on
line diff