documentation: wording improvements

Diff best viewed with --color-diff.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Elijah Newren
2023-10-08 06:45:03 +00:00
committed by Junio C Hamano
parent 3a06386e31
commit cf6cac2005
74 changed files with 134 additions and 133 deletions

View File

@ -11,7 +11,7 @@ Message-ID: <BAYC1-PASMTP12374B54BA370A1E1C6E78AE4E0@CEZ.ICE>
How to use the subtree merge strategy
=====================================
There are situations where you want to include contents in your project
There are situations where you want to include content in your project
from an independently developed project. You can just pull from the
other project as long as there are no conflicting paths.