Merge branch 'sc/fmt-merge-msg-doc-markup-fix' into maint
commit6afadbd5ee4557982a7c049bb5bb539a5b21775f
authorJunio C Hamano <gitster@pobox.com>
Tue, 29 Nov 2016 21:27:59 +0000 (29 13:27 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 29 Nov 2016 21:28:00 +0000 (29 13:28 -0800)
tree5ddafc3a2444440a239bfb900f309f4a34affb70
parentc8a3ec37abe5395e4f4c14d5e9f0ab8077140f1b
parent4259d693fc09c8aaaf93269a6ecaa6185e0a9999
Merge branch 'sc/fmt-merge-msg-doc-markup-fix' into maint

Documentation fix.

* sc/fmt-merge-msg-doc-markup-fix:
  Documentation/fmt-merge-msg: fix markup in example