Browse Source

Change "added.moved or removed" to "added, moved or removed" in

Signed-off-by: Matt Kraai <kraai@ftbfs.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Matt Kraai 18 years ago committed by Junio C Hamano
parent
commit
95fd73ab22
  1. 2
      Documentation/core-intro.txt

2
Documentation/core-intro.txt

@ -528,7 +528,7 @@ paths that have been trivially merged. @@ -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

Loading…
Cancel
Save