Merge branch 'np/delta'

[git.git] / Documentation / core-intro.txt

diff --git a/Documentation/core-intro.txt b/Documentation/core-intro.txt
index eea44d9d5613f448b8c2b8f0aae236f917efad39..f3cc2238c72d11e611a756e366d797c9d8056111 100644 (file)
--- a/Documentation/core-intro.txt
+++ b/Documentation/core-intro.txt
@@ -528,7 +528,7 @@ paths that have been trivially merged.
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Sadly, many merges aren't trivial. If there are files that have
-been added.moved or removed, or if both branches have modified the
+been added, moved or removed, or if both branches have modified the
 same file, you will be left with an index tree that contains "merge
 entries" in it. Such an index tree can 'NOT' be written out to a tree
 object, and you will have to resolve any such merge clashes using