equal
deleted
inserted
replaced
21 If the pulled changes add a new branch head, the head is |
21 If the pulled changes add a new branch head, the head is |
22 automatically merged, and the result of the merge is committed. |
22 automatically merged, and the result of the merge is committed. |
23 Otherwise, the working directory is updated to include the new |
23 Otherwise, the working directory is updated to include the new |
24 changes. |
24 changes. |
25 |
25 |
26 When a merge occurs, the newly pulled changes are assumed to be |
26 When a merge is needed, the working directory is first updated to |
27 "authoritative". The head of the new changes is used as the first |
27 the newly pulled changes. Local changes are then merged into the |
28 parent, with local changes as the second. To switch the merge |
28 pulled changes. To switch the merge order, use --switch-parent. |
29 order, use --switch-parent. |
|
30 |
29 |
31 See :hg:`help dates` for a list of formats valid for -d/--date. |
30 See :hg:`help dates` for a list of formats valid for -d/--date. |
32 |
31 |
33 Returns 0 on success. |
32 Returns 0 on success. |
34 ''' |
33 ''' |