From: Elijah Newren <newren@gmail.com>
Date: Wed, 30 Oct 2019 20:21:17 +0000 (+0000)
Subject: RelNotes/2.24.0: typofix
X-Git-Tag: v2.24.0~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=849e43680d5c6ee431378c66f839113ab74146ae;p=thirdparty%2Fgit.git

RelNotes/2.24.0: typofix

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/Documentation/RelNotes/2.24.0.txt b/Documentation/RelNotes/2.24.0.txt
index b7083cd6b2..26e018078d 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).