summaryrefslogtreecommitdiff
path: root/Documentation/RelNotes
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2019-10-30 20:21:17 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-11-02 05:43:51 (GMT)
commit849e43680d5c6ee431378c66f839113ab74146ae (patch)
treececdc970066bf86e081ecae3574aa4ac34c02c65 /Documentation/RelNotes
parentf21f8f5d35b09ecdd1a0112f114436fd2eda7df2 (diff)
downloadgit-849e43680d5c6ee431378c66f839113ab74146ae.zip
git-849e43680d5c6ee431378c66f839113ab74146ae.tar.gz
git-849e43680d5c6ee431378c66f839113ab74146ae.tar.bz2
RelNotes/2.24.0: typofix
Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/RelNotes')
-rw-r--r--Documentation/RelNotes/2.24.0.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/RelNotes/2.24.0.txt b/Documentation/RelNotes/2.24.0.txt
index b7083cd..26e0180 100644
--- a/Documentation/RelNotes/2.24.0.txt
+++ b/Documentation/RelNotes/2.24.0.txt
@@ -316,7 +316,7 @@ Fixes since v2.23
to access the worktree correctly, which has been corrected.
(merge dfd557c978 js/stash-apply-in-secondary-worktree later to maint).
- * The merge-recursive machiery is one of the most complex parts of
+ * The merge-recursive machinery is one of the most complex parts of
the system that accumulated cruft over time. This large series
cleans up the implementation quite a bit.
(merge b657047719 en/merge-recursive-cleanup later to maint).