From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 5 Sep 2013 21:24:59 +0000 (-0700)
Subject: Merge branch 'maint-1.8.3' into maint
X-Git-Tag: v1.8.4.1~18
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b5699d17c3e04a022227fd95106e89f281417dcd;p=thirdparty%2Fgit.git

Merge branch 'maint-1.8.3' into maint

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

b5699d17c3e04a022227fd95106e89f281417dcd