tree 764055437b95612b7c849310f62770cadff6b616
parent e99c325bb48cc2e30a763963bff0eb3eceed35ec
parent 9299f84921e0bd076cf998aa852fadb73627756f
author Junio C Hamano <gitster@pobox.com> 1581540098 -0800
committer Junio C Hamano <gitster@pobox.com> 1581540098 -0800

Merge branch 'ma/diff-doc-clarify-regexp-example'

Doc clarification.

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