Mercurial > hg
changeset 7991:675a5a1ab0ee
fetch: word-wrap help texts at 70 characters
| author | Martin Geisler <mg@daimi.au.dk> |
|---|---|
| date | Sat, 04 Apr 2009 23:17:21 +0200 |
| parents | cdb848e8c4b5 |
| children | 0e7f02eaa63b |
| files | hgext/fetch.py |
| diffstat | 1 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/fetch.py Sat Apr 04 23:17:12 2009 +0200 +++ b/hgext/fetch.py Sat Apr 04 23:17:21 2009 +0200 @@ -16,9 +16,10 @@ This finds all changes from the repository at the specified path or URL and adds them to the local repository. - If the pulled changes add a new branch head, the head is automatically - merged, and the result of the merge is committed. Otherwise, the - working directory is updated to include the new changes. + If the pulled changes add a new branch head, the head is + automatically merged, and the result of the merge is committed. + Otherwise, the working directory is updated to include the new + changes. When a merge occurs, the newly pulled changes are assumed to be "authoritative". The head of the new changes is used as the first