Merge branch 'ty/doc-diff-u-wo-number' into next

"git diff -U<num>" was too lenient in its command line parsing and
took an empty string as a valid <num>.

* ty/doc-diff-u-wo-number:
  diff: document -U without <n> as using default context

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