Improvements for diff-hl and some evil plugins