* [PATCH] Change "added.moved or removed" to "added, moved or removed" in
@ 2007-07-07 1:23 Matt Kraai
0 siblings, 0 replies; only message in thread
From: Matt Kraai @ 2007-07-07 1:23 UTC (permalink / raw)
To: git; +Cc: Matt Kraai
Signed-off-by: Matt Kraai <kraai@ftbfs.org>
---
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
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2007-07-07 1:24 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-07-07 1:23 [PATCH] Change "added.moved or removed" to "added, moved or removed" in Matt Kraai
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).