From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 12 Sep 2011 04:52:18 +0000 (-0700)
Subject: Merge branch 'jn/doc-dashdash' into maint
X-Git-Tag: v1.7.6.3~10
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/7baf32a829e6e253f8b3b683da470be36b54c377?hp=7baf32a829e6e253f8b3b683da470be36b54c377

Merge branch 'jn/doc-dashdash' into maint

* jn/doc-dashdash:
Documentation/i18n: quote double-dash for AsciiDoc
Documentation: quote double-dash for AsciiDoc

Conflicts:
Documentation/git-mergetool--lib.txt
---