diff options
Diffstat (limited to 'Documentation/RelNotes/2.24.0.txt')
| -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 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). |