difftools: use [^ \t\-\+] to recognize end-of-chunk
difftools.vim: Fix mixed issues