Merge branch 'maint'

* maint:
  Rename diff.suppress-blank-empty to diff.suppressBlankEmpty

diff --cc Documentation/config.txt
Simple merge

diff --cc diff.c
Simple merge