Merge branch 'rs/diff-whole-function'

* rs/diff-whole-function:
  diff: add option to show whole functions as context
  xdiff: factor out get_func_line()

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

diff --cc diff.c
Simple merge