Merge branch 'ma/diff-doc-clarify-regexp-example'
authorJunio C Hamano <gitster@pobox.com>
Wed, 12 Feb 2020 20:41:38 +0000 (12:41 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 12 Feb 2020 20:41:38 +0000 (12:41 -0800)
commit0d114107f58cebdee5e25ea46e161531c24cb5d8
tree764055437b95612b7c849310f62770cadff6b616
parente99c325bb48cc2e30a763963bff0eb3eceed35ec
parent9299f84921e0bd076cf998aa852fadb73627756f
Merge branch 'ma/diff-doc-clarify-regexp-example'

Doc clarification.

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