diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-09-11 21:52:18 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-09-11 21:52:18 -0700 |
| commit | 7baf32a829e6e253f8b3b683da470be36b54c377 (patch) | |
| tree | 61d90f9c79285ec276cc4478c148395ca7c7ed6d /Documentation/technical/trivial-merge.txt | |
| parent | Merge branch 'jk/maint-1.7.2-status-ignored' into maint (diff) | |
| parent | Documentation/i18n: quote double-dash for AsciiDoc (diff) | |
| download | tgif-7baf32a829e6e253f8b3b683da470be36b54c377.tar.xz | |
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
Diffstat (limited to 'Documentation/technical/trivial-merge.txt')
0 files changed, 0 insertions, 0 deletions