equal
deleted
inserted
replaced
23 searching for changes |
23 searching for changes |
24 adding changesets |
24 adding changesets |
25 adding manifests |
25 adding manifests |
26 adding file changes |
26 adding file changes |
27 added 1 changesets with 1 changes to 1 files (+1 heads) |
27 added 1 changesets with 1 changes to 1 files (+1 heads) |
28 not updating: not a linear update |
28 abort: not updating: not a linear update |
29 (merge or update --check to force update) |
29 (merge or update --check to force update) |
|
30 [255] |
30 |
31 |
31 $ cd ../tt |
32 $ cd ../tt |
32 |
33 |
33 Should not update: |
34 Should not update: |
34 |
35 |
37 searching for changes |
38 searching for changes |
38 adding changesets |
39 adding changesets |
39 adding manifests |
40 adding manifests |
40 adding file changes |
41 adding file changes |
41 added 1 changesets with 1 changes to 1 files (+1 heads) |
42 added 1 changesets with 1 changes to 1 files (+1 heads) |
42 not updating: not a linear update |
43 abort: not updating: not a linear update |
43 (merge or update --check to force update) |
44 (merge or update --check to force update) |
|
45 [255] |
44 |
46 |
45 $ HGMERGE=true hg merge |
47 $ HGMERGE=true hg merge |
46 merging foo |
48 merging foo |
47 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
49 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
48 (branch merge, don't forget to commit) |
50 (branch merge, don't forget to commit) |