Bug#1140942: vimdiff: colored highlighting hides textual file diff

[Nikolas Nyby]

There is an upstream fix for this here:

  https://github.com/vim/vim/pull/20711