Merge branch 'rh/diff-orderfile-doc'

Documentation fix.

* rh/diff-orderfile-doc:
  diff: document the format of the -O (diff.orderFile) file
  diff: document behavior of relative diff.orderFile

diff --cc Documentation/diff-config.txt
Simple merge

diff --cc Documentation/diff-options.txt
Simple merge