Merge pull request #288 from Zachary-Holland/vimdiff
commite787b3790af1b465a1eef8b8663efb845e52df5d
authordscho <johannes.schindelin@gmx.de>
Sat, 28 Feb 2015 21:49:29 +0000 (28 22:49 +0100)
committerdscho <johannes.schindelin@gmx.de>
Sat, 28 Feb 2015 21:49:29 +0000 (28 22:49 +0100)
tree4cc68b9e5136269df064df581cfb27c4fde2d6d1
parent743431adea265410bffc786f511dfcb9f0e0673a
parentf15ac0e6c37075941f8c1a8e97bde6a3be5dadc0
Merge pull request #288 from Zachary-Holland/vimdiff

 make vimdiff be able to be called by git mergetool