gitconfig: vimdiff as mergetool

Signed-off-by: Erik Bernoth <erik.bernoth@gmail.com>