tree c286a11ab7e2df19967833a93ae4827e07dc2fc5
parent 7137d6089b510c73fe74136bf50dca53ec61a747
parent 9299f84921e0bd076cf998aa852fadb73627756f
author Junio C Hamano <gitster@pobox.com> 1581712953 -0800
committer Junio C Hamano <gitster@pobox.com> 1581712953 -0800

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