1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
@ 5: L3
|
o 4: L2
|
o 3: L1
|
| o 2: C3
|/
o 1: C2
|
o 0: C1
% Try to call --continue
abort: no rebase in progress
% Conflicting rebase
merging common
warning: conflicts during merge.
merging common failed!
abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
% Try to continue without solving the conflict
abort: unresolved merge conflicts (see hg resolve)
% Conclude rebase
saved backup bundle to
@ 5: L3
|
o 4: L2
|
o 3: L1
|
o 2: C3
|
o 1: C2
|
o 0: C1
% Check correctness
- Rev. 0
c1
- Rev. 1
c1
c2
- Rev. 2
c1
c2
c3
- Rev. 3
c1
c2
c3
- Rev. 4
resolved merge
- Rev. 5
resolved merge
|
