diff options
| author | Matt Kraai <kraai@ftbfs.org> | 2007-07-06 18:23:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-07-06 18:56:34 -0700 |
| commit | 95fd73ab22f9a9a1b7a1275c934991340eeb8839 (patch) | |
| tree | 7182ca0b45e3e1d0cdad1ec37f13175bd5ac66d4 /Documentation | |
| parent | 483891810c5f814ede2407999a0d0b961def246c (diff) | |
| download | git-95fd73ab22f9a9a1b7a1275c934991340eeb8839.tar.gz git-95fd73ab22f9a9a1b7a1275c934991340eeb8839.tar.xz | |
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>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | 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 eea44d9d5..f3cc2238c 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 |