comparison bin/git-conflict @ 85:8a5464ec3c29

Add vim mappings from https://bitbucket.org/sjl/dotfiles
author zegervdv <zegervdv@me.com>
date Thu, 31 Jul 2014 21:38:35 +0200
parents faf7781dae42
children
comparison
equal deleted inserted replaced
84:d282fe62a215 85:8a5464ec3c29