[PATCH] Change "added.moved or removed" to "added, moved or removed" in
From: Matt Kraai <hidden>
Date: 2016-06-15 22:43:20
Subsystem:
documentation, the rest · Maintainers:
Jonathan Corbet, Linus Torvalds
Signed-off-by: Matt Kraai <redacted> --- Documentation/core-intro.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Documentation/core-intro.txt b/Documentation/core-intro.txt
index eea44d9..f3cc223 100644
--- 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
--
1.5.2.3