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

Junio C Hamano committed Nov 29, 2016 at 13:27 UTC 6afadbd5ee4557982a7c049bb5bb539a5b21775f

No changes.