5044
|
1 adding bar
|
|
2 adding foo
|
5109
|
3 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
5044
|
4 % start imerge
|
|
5 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
6 (branch merge, don't forget to commit)
|
5109
|
7 merging e6da46716401 and 30d266f502e7
|
5044
|
8 remaining:
|
5109
|
9 foo (foo2)
|
5044
|
10 foo
|
|
11 bar
|
|
12 bar
|
|
13 bar
|
|
14 % status
|
5109
|
15 merging e6da46716401 and 30d266f502e7
|
5044
|
16 remaining:
|
5109
|
17 foo (foo2)
|
|
18 % next
|
|
19 foo
|
5044
|
20 % merge next
|
5109
|
21 merging foo and foo2
|
5044
|
22 all conflicts resolved
|
|
23 % unresolve
|
|
24 % merge foo
|
5109
|
25 merging foo and foo2
|
5044
|
26 all conflicts resolved
|
|
27 % save
|
|
28 % load
|
5109
|
29 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
5044
|
30 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
|
|
32 (branch merge, don't forget to commit)
|
5109
|
33 merging e6da46716401 and 30d266f502e7
|
5044
|
34 resolved:
|
|
35 foo
|
|
36 all conflicts resolved
|
|
37 foo
|
5109
|
38 changeset: 3:fa9a6defdcaf
|
5044
|
39 tag: tip
|
|
40 parent: 2:e6da46716401
|
5109
|
41 parent: 1:30d266f502e7
|
5044
|
42 user: test
|
|
43 date: Thu Jan 01 00:00:03 1970 +0000
|
5109
|
44 files: foo foo2
|
5044
|
45 description:
|
|
46 merged
|
|
47
|
|
48
|
|
49 % nothing to merge
|
|
50 abort: there is nothing to merge - use "hg update" instead
|