gitconfig includes merge tool and diff tool set as vimdiff