From: Jonathan Nieder <jrnieder@gmail.com>
Date: Mon, 14 Oct 2013 18:07:50 +0000 (-0700)
Subject: Merge branch 'rj/doc-formatting-fix'
X-Git-Tag: v1.8.5-rc0~62
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/865156a7cb72a579c144220204fd7b447ca4e50f?ds=inline;hp=--cc

Merge branch 'rj/doc-formatting-fix'

* rj/doc-formatting-fix:
howto/revert-a-faulty-merge: fix unescaped '^'s
howto/setup-git-server-over-http: fix unescaped '^'s
---

865156a7cb72a579c144220204fd7b447ca4e50f