@matheusbsbs / matheus-bagliano / commits / 95fd73ab22
Fork 0

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>

Matt Kraai committed Jul 6, 2007 at 18:23 UTC 95fd73ab22f9a9a1b7a1275c934991340eeb8839
1 file changed +1 -1
Documentation/core-intro.txt
+1 -1
@@ -528,7 +528,7 @@ paths that have been trivially merged.
528 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
529
530 Sadly, many merges aren't trivial. If there are files that have
531 -been added.moved or removed, or if both branches have modified the
531 +been added, moved or removed, or if both branches have modified the
532 same file, you will be left with an index tree that contains "merge
533 entries" in it. Such an index tree can 'NOT' be written out to a tree
534 object, and you will have to resolve any such merge clashes using