Improve vimdiff config