Removing vimdiff3 as mergetool -- think I'll keep doing it manually.