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: http://git.ipfire.org/?a=commitdiff_plain;h=d2dbd399fa03b37ce797ed6fc609574a7e677079;p=thirdparty%2Fgit.git

Sync with maint

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

d2dbd399fa03b37ce797ed6fc609574a7e677079