From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 31 Oct 2016 20:15:26 +0000 (-0700)
Subject: Merge branch 'sc/fmt-merge-msg-doc-markup-fix'
X-Git-Tag: v2.11.0-rc0~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=590f0bfe9f8c97fe64a32354191b135d136d6f3a;p=thirdparty%2Fgit.git

Merge branch 'sc/fmt-merge-msg-doc-markup-fix'

Documentation fix.

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

590f0bfe9f8c97fe64a32354191b135d136d6f3a