--- 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