diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-09-03 09:43:42 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-03 09:43:42 -0700 |
| commit | 7bdaf0bd1cffde9b3d14762f67f22991e8e17ef6 (patch) | |
| tree | 7b77d403201c495a69ffb2123d64fcea03f2e05c /builtin/merge.c | |
| parent | b9f171cc3b3f7f528acf672b5fef7e95b153213b (diff) | |
| parent | 2839478774f48074d7d87b8a9838827742a5b058 (diff) | |
| download | git-7bdaf0bd1cffde9b3d14762f67f22991e8e17ef6.tar.gz | |
Merge branch 'jc/maint-doc-em-dash'
* jc/maint-doc-em-dash:
Work around em-dash handling in newer AsciiDoc
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions