change git diff&merge tool to macvim