Merge branch 'ma/diff-doc-clarify-regexp-example' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 14 Feb 2020 20:42:33 +0000 (12:42 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 14 Feb 2020 20:42:33 +0000 (12:42 -0800)
commitb907ca76f0897f9a7f070a106c7706fc399509da
treec286a11ab7e2df19967833a93ae4827e07dc2fc5
parent7137d6089b510c73fe74136bf50dca53ec61a747
parent9299f84921e0bd076cf998aa852fadb73627756f
Merge branch 'ma/diff-doc-clarify-regexp-example' into maint

Doc clarification.

* ma/diff-doc-clarify-regexp-example:
  diff-options.txt: avoid "regex" overload in example