From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 29 Nov 2016 21:27:59 +0000 (-0800)
Subject: Merge branch 'sc/fmt-merge-msg-doc-markup-fix' into maint
X-Git-Tag: v2.11.1~67^2~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6afadbd5ee4557982a7c049bb5bb539a5b21775f;p=thirdparty%2Fgit.git

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
---

6afadbd5ee4557982a7c049bb5bb539a5b21775f