diff bin/git-conflict @ 175:a7247b4a7e69

Fix issue with mapping where vim would hang on unmapped <leader> keys
author zegervdv <zegervdv@me.com>
date Tue, 04 Nov 2014 20:49:12 +0100
parents faf7781dae42
children
line wrap: on
line diff