diff options
| author | Elijah Newren <newren@gmail.com> | 2019-11-05 17:07:20 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-11-07 04:42:00 (GMT) |
| commit | 031fd4b93b8182761948aa348565118955f48307 (patch) | |
| tree | 2d4632eff752e87e9e417903584152f50d2d58ae /Documentation/technical/rerere.txt | |
| parent | 566a1439f6f56c2171b8853ddbca0ad3f5098770 (diff) | |
| download | git-031fd4b93b8182761948aa348565118955f48307.zip git-031fd4b93b8182761948aa348565118955f48307.tar.gz git-031fd4b93b8182761948aa348565118955f48307.tar.bz2 | |
Documentation: fix a bunch of typos, both old and new
Reported-by: Jens Schleusener <Jens.Schleusener@fossies.org>
Signed-off-by: Elijah Newren <newren@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 aa22d7a..af5f9fc 100644 --- a/Documentation/technical/rerere.txt +++ b/Documentation/technical/rerere.txt @@ -117,7 +117,7 @@ early A became C or B, a late X became Y or Z". We can see there are 4 combinations of ("B or C", "C or B") x ("X or Y", "Y or X"). By sorting, the conflict is given its canonical name, namely, "an -early part became B or C, a late part becames X or Y", and whenever +early part became B or C, a late part became X or Y", and whenever any of these four patterns appear, and we can get to the same conflict and resolution that we saw earlier. |