Merge branch 'jc/diff-prefix'

* jc/diff-prefix:
  diff: vary default prefix depending on what are compared

diff --cc Documentation/config.txt
Simple merge

diff --cc builtin-diff.c
Simple merge

diff --cc combine-diff.c
Simple merge

diff --cc diff.c
Simple merge

diff --cc diff.h
Simple merge