From: Jonathan Nieder Date: Mon, 14 Oct 2013 18:07:50 +0000 (-0700) Subject: Merge branch 'rj/doc-formatting-fix' X-Git-Tag: rs/ref-transaction-1~609 X-Git-Url: https://repo.or.cz/w/git/jrn.git/commitdiff_plain/865156a7cb72a579c144220204fd7b447ca4e50f 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