summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4838918)
raw | patch | inline | side by side (parent: 4838918)
author | Matt Kraai <kraai@ftbfs.org> | |
Sat, 7 Jul 2007 01:23:54 +0000 (18:23 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Sat, 7 Jul 2007 01:56:34 +0000 (18:56 -0700) |
Signed-off-by: Matt Kraai <kraai@ftbfs.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/core-intro.txt | patch | blob | history |
index eea44d9d5613f448b8c2b8f0aae236f917efad39..f3cc2238c72d11e611a756e366d797c9d8056111 100644 (file)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
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