--- a/hgext/fetch.py Sat Apr 04 18:31:01 2009 +0200
+++ b/hgext/fetch.py Sat Apr 04 21:09:43 2009 +0200
@@ -17,12 +17,12 @@
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
+ 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
- parent, with local changes as the second. To switch the merge
+ "authoritative". The head of the new changes is used as the first
+ parent, with local changes as the second. To switch the merge
order, use --switch-parent.
See 'hg help dates' for a list of formats valid for -d/--date.