diff options
| author | Pavel Roskin <proski@gnu.org> | 2006-07-09 03:44:30 -0400 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-07-09 02:42:41 -0700 |
| commit | addf88e455f85bc6cfe0284b70aaad10b6d3486e (patch) | |
| tree | 704e8b6de26fde0bff86618e363dbde9f70e1393 /Documentation/git-merge.txt | |
| parent | 88f0d5d7d95f815d2e8a36a8ceb7459dbd90992c (diff) | |
| download | git-addf88e455f85bc6cfe0284b70aaad10b6d3486e.tar.gz git-addf88e455f85bc6cfe0284b70aaad10b6d3486e.tar.xz | |
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.txt | 2 |
1 files changed, 1 insertions, 1 deletions
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. |