Merge branch 'ec/diff-noprefix-config'

* ec/diff-noprefix-config:
  diff: add configuration option for disabling diff prefixes.

diff --cc Documentation/config.txt
Simple merge

diff --cc diff.c
Simple merge