Improved Vimdiff coloring.