Merge branch 'jn/doc-dashdash' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 12 Sep 2011 04:52:18 +0000 (21:52 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 12 Sep 2011 04:52:18 +0000 (21:52 -0700)
* jn/doc-dashdash:
Documentation/i18n: quote double-dash for AsciiDoc
Documentation: quote double-dash for AsciiDoc

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

No differences found