Merge branch 'maint-1.8.3' into maint
authorJunio C Hamano <redacted>
Thu, 5 Sep 2013 21:24:59 +0000 (14:24 -0700)
committerJunio C Hamano <redacted>
Thu, 5 Sep 2013 21:24:59 +0000 (14:24 -0700)
* maint-1.8.3:
  Documentation/git-merge.txt: fix formatting of example block


Trivial merge
git clone https://git.99rst.org/PROJECT