Merge branch 'dp/submodule-doc-markup-fix'
commit62fef5c5645ccb47894741b435d753aa3d57851b
authorJunio C Hamano <gitster@pobox.com>
Thu, 16 Feb 2017 22:45:15 +0000 (16 14:45 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 16 Feb 2017 22:45:15 +0000 (16 14:45 -0800)
tree07f03ecb65ba97b0e7dcc3eaed4dd42a062ac18b
parent1f73ff0802c63bf01bcf30ee7b9e8d310cbee375
parent8ab9740d9f6dd0f0af87b7ac32a407d0a8aeacab
Merge branch 'dp/submodule-doc-markup-fix'

Doc fix.

* dp/submodule-doc-markup-fix:
  config.txt: fix formatting of submodule.alternateErrorStrategy section
Documentation/config.txt