![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 12 Sep 2011 04:52:18 +0000 (21:52 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 12 Sep 2011 04:52:18 +0000 (21:52 -0700) | ||
| commit | 7baf32a829e6e253f8b3b683da470be36b54c377 | |
| tree | 61d90f9c79285ec276cc4478c148395ca7c7ed6d | tree | snapshot |
| parent | 3fc44a10f62fdca29558dc553a3e12949af30637 | commit | diff |
| parent | 27269fc5f2781cd8f6e832043f9abf7305aa3d49 | commit | diff |
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
* jn/doc-dashdash:
Documentation/i18n: quote double-dash for AsciiDoc
Documentation: quote double-dash for AsciiDoc
Conflicts:
Documentation/git-mergetool--lib.txt