summaryrefslogtreecommitdiffstats
path: root/howto/using-merge-subtree.txt
diff options
context:
space:
mode:
Diffstat (limited to 'howto/using-merge-subtree.txt')
-rw-r--r--howto/using-merge-subtree.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/howto/using-merge-subtree.txt b/howto/using-merge-subtree.txt
index a499a94ac..3bd581ac3 100644
--- a/howto/using-merge-subtree.txt
+++ b/howto/using-merge-subtree.txt
@@ -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.