From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 5 Sep 2013 21:41:40 +0000 (-0700)
Subject: Sync with maint
X-Git-Tag: v1.8.5-rc0~176
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d2dbd399fa03b37ce797ed6fc609574a7e677079

Sync with maint

* maint:
Documentation/git-merge.txt: fix formatting of example block
---

d2dbd399fa03b37ce797ed6fc609574a7e677079