Show More
@@ -26,7 +26,7 b' cd ..' | |||||
26 |
|
26 | |||
27 | echo % pull into work and merge |
|
27 | echo % pull into work and merge | |
28 | cd foo-work |
|
28 | cd foo-work | |
29 | hg pull |
|
29 | hg pull -q | |
30 | hg merge |
|
30 | hg merge | |
31 |
|
31 | |||
32 | echo % revert to changeset 1 to simulate a failed merge |
|
32 | echo % revert to changeset 1 to simulate a failed merge |
@@ -8,13 +8,6 b' adding beta' | |||||
8 | % create gamma in first repo |
|
8 | % create gamma in first repo | |
9 | adding gamma |
|
9 | adding gamma | |
10 | % pull into work and merge |
|
10 | % pull into work and merge | |
11 | pulling from /tmp/hgtests.H64eVH/test-manifest-merging/foo-base |
|
|||
12 | searching for changes |
|
|||
13 | adding changesets |
|
|||
14 | adding manifests |
|
|||
15 | adding file changes |
|
|||
16 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
|||
17 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
|||
18 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
11 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
19 | (branch merge, don't forget to commit) |
|
12 | (branch merge, don't forget to commit) | |
20 | % revert to changeset 1 to simulate a failed merge |
|
13 | % revert to changeset 1 to simulate a failed merge |
General Comments 0
You need to be logged in to leave comments.
Login now