diff options
| author |  Elijah Newren <newren@gmail.com> | 2019-10-30 20:21:17 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-11-02 14:43:51 +0900 |
| commit | 849e43680d5c6ee431378c66f839113ab74146ae (patch) | |
| tree | cecdc970066bf86e081ecae3574aa4ac34c02c65 | |
| parent | Git 2.24-rc2 (diff) | |
| download | tgif-849e43680d5c6ee431378c66f839113ab74146ae.tar.xz | |
RelNotes/2.24.0: typofix
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/RelNotes/2.24.0.txt | 2 |
1 files changed, 1 insertions, 1 deletions
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). |