diff bin/git-conflict @ 16:17afab9bd228

Open vim at last known position
author zegervdv <zegervdv@me.com>
date Wed, 12 Mar 2014 21:35:40 +0100
parents d35280c9b023
children faf7781dae42
line wrap: on
line diff