diff options
| author | Andrei Rybak <rybak.a.v@gmail.com> | 2023-01-23 10:01:14 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-01-23 18:40:14 +0100 |
| commit | 70661d288b696578f18b56cea1beaa51497da88d (patch) | |
| tree | 86811cee988afe65a4758dd1ed6eb80175685aa3 /Documentation/technical/rerere.txt | |
| parent | Sync with maint-2.38 (diff) | |
| download | git-70661d288b696578f18b56cea1beaa51497da88d.tar.xz git-70661d288b696578f18b56cea1beaa51497da88d.zip | |
Documentation: render dash correctly
Three hyphens are rendered verbatim in documentation, so "--" has to be
used to produce a dash. Fix asciidoc output for dashes. This is
similar to previous commits f0b922473e (Documentation: render special
characters correctly, 2021-07-29) and de82095a95 (doc
hash-function-transition: fix asciidoc output, 2021-02-05).
Signed-off-by: Andrei Rybak <rybak.a.v@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/technical/rerere.txt')
| -rw-r--r-- | Documentation/technical/rerere.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/technical/rerere.txt b/Documentation/technical/rerere.txt index 35d4541433..be58f1bee3 100644 --- a/Documentation/technical/rerere.txt +++ b/Documentation/technical/rerere.txt @@ -99,7 +99,7 @@ conflict to leave line D means that the user declares: compatible with what AB and AC wanted to do. So the conflict we would see when merging AB into ACAB should be -resolved the same way---it is the resolution that is in line with that +resolved the same way--it is the resolution that is in line with that declaration. Imagine that similarly previously a branch XYXZ was forked from XY, |