Show More
@@ -21,5 +21,5 b' hg --cwd b parents -q' | |||||
21 |
|
21 | |||
22 | echo c > c/c |
|
22 | echo c > c/c | |
23 | hg --cwd c commit -d '3 0' -Amc |
|
23 | hg --cwd c commit -d '3 0' -Amc | |
24 | hg --cwd c fetch ../a |
|
24 | hg --cwd c fetch -d '4 0' -m 'automated merge' ../a | |
25 | ls c |
|
25 | ls c |
@@ -21,7 +21,7 b' adding file changes' | |||||
21 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
21 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
22 | merging with new head 2:97d72e5f12c7 |
|
22 | merging with new head 2:97d72e5f12c7 | |
23 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
23 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
24 |
new changeset 3: |
|
24 | new changeset 3:cd3a41621cf0 merges remote changes with local | |
25 | a |
|
25 | a | |
26 | b |
|
26 | b | |
27 | c |
|
27 | c |
General Comments 0
You need to be logged in to leave comments.
Login now