From: Junio C Hamano <redacted>
Date: Thu, 5 Sep 2013 21:24:52 +0000 (-0700)
Subject: Merge branch 'maint-1.8.2' into maint-1.8.3
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=69490f345943f6f6d7ae52e0e9c870e8b48a5dea;p=git.git

Merge branch 'maint-1.8.2' into maint-1.8.3

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

69490f345943f6f6d7ae52e0e9c870e8b48a5dea