Merge branch 'tr/maint-word-diff-incomplete-line'

* tr/maint-word-diff-incomplete-line:
  word-diff: ignore '\ No newline at eof' marker

diff --cc diff.c
Simple merge

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