equal
deleted
inserted
replaced
2 adding foo |
2 adding foo |
3 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
3 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
4 % start imerge |
4 % start imerge |
5 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
5 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
6 (branch merge, don't forget to commit) |
6 (branch merge, don't forget to commit) |
7 merging e6da46716401 and 30d266f502e7 |
7 U foo |
8 remaining: |
|
9 foo (foo2) |
|
10 foo |
8 foo |
11 bar |
9 bar |
12 bar |
10 bar |
13 bar |
11 bar |
14 % status |
12 % status -v |
15 merging e6da46716401 and 30d266f502e7 |
13 merging e6da46716401 and 30d266f502e7 |
16 remaining: |
14 U foo (foo2) |
17 foo (foo2) |
|
18 % next |
15 % next |
19 foo |
16 foo |
20 % merge next |
17 % merge next |
21 merging foo and foo2 |
18 merging foo and foo2 |
22 all conflicts resolved |
19 all conflicts resolved |
28 % load |
25 % load |
29 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
26 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
30 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
27 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
31 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
28 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
32 (branch merge, don't forget to commit) |
29 (branch merge, don't forget to commit) |
33 merging e6da46716401 and 30d266f502e7 |
30 R foo |
34 resolved: |
|
35 foo |
|
36 all conflicts resolved |
31 all conflicts resolved |
37 foo |
32 foo |
38 changeset: 3:fa9a6defdcaf |
33 changeset: 3:fa9a6defdcaf |
39 tag: tip |
34 tag: tip |
40 parent: 2:e6da46716401 |
35 parent: 2:e6da46716401 |