|author||Junio C Hamano <firstname.lastname@example.org>||2019-11-08 16:57:45 +0900|
|committer||Junio C Hamano <email@example.com>||2019-11-08 16:57:45 +0900|
This hunk was part of an update to the master branch, but the identical text also had appeared in an earlier iteration of en/doc-typofix---and was lost while reverting the merge of that topic. Signed-off-by: Junio C Hamano <firstname.lastname@example.org>
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/RelNotes/2.24.0.txt b/Documentation/RelNotes/2.24.0.txt
index 42fdb05905..bde154124c 100644
@@ -315,7 +315,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).