Merge branch 'pw/word-diff-zero-width-matches'

The word-diff mode has been taught to work better with a word
regexp that can match an empty string.

* pw/word-diff-zero-width-matches:
  word diff: handle zero length matches

diff --cc diff.c
Simple merge

diff --cc t/t4034-diff-words.sh
Simple merge