X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-merge.txt;h=bebf30ad3db951c0a0bad01ebee619821781eb39;hb=5d043a3d856bd40d8b34b8836a561e438d23573b;hp=4ce799b520b501b1ea6dddd5643bf3aec2aca344;hpb=a549e11cc2fee10ddf66dd98ea79f7c624eee34e;p=git.git

diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 4ce799b52..bebf30ad3 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.