summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorPavel Roskin <proski@gnu.org>2006-07-09 07:44:30 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-07-09 09:42:41 (GMT)
commitaddf88e455f85bc6cfe0284b70aaad10b6d3486e (patch)
tree704e8b6de26fde0bff86618e363dbde9f70e1393 /Documentation/git-merge.txt
parent88f0d5d7d95f815d2e8a36a8ceb7459dbd90992c (diff)
downloadgit-addf88e455f85bc6cfe0284b70aaad10b6d3486e.zip
git-addf88e455f85bc6cfe0284b70aaad10b6d3486e.tar.gz
git-addf88e455f85bc6cfe0284b70aaad10b6d3486e.tar.bz2
Assorted typo fixes
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-merge.txt')
-rw-r--r--Documentation/git-merge.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 4ce799b..bebf30a 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -83,7 +83,7 @@ your local modifications interfere with the merge, again, it
stops before touching anything.
So in the above two "failed merge" case, you do not have to
-worry about lossage of data --- you simply were not ready to do
+worry about loss of data --- you simply were not ready to do
a merge, so no merge happened at all. You may want to finish
whatever you were in the middle of doing, and retry the same
pull after you are done and ready.