tiokksar/dotfiles — pull request #1 by john-doee (2012-11-15 12:08:12+00:00)
Title: Mergetool set to vimdiff

Mergetool set to vimdiff