equal
deleted
inserted
replaced
1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1 |
2 created new head |
|
3 @ 4: L2 |
2 @ 4: L2 |
4 | |
3 | |
5 o 3: L1 |
4 o 3: L1 |
6 | |
5 | |
7 | o 2: C3 |
6 | o 2: C3 |
28 |/ |
27 |/ |
29 o 1: C2 |
28 o 1: C2 |
30 | |
29 | |
31 o 0: C1 |
30 o 0: C1 |
32 |
31 |
|
32 |
|
33 % Rebase and abort without generating new changesets |
|
34 |
|
35 @ 4:C1 |
|
36 | |
|
37 o 3:B bis |
|
38 | |
|
39 | o 2:C |
|
40 | | |
|
41 | o 1:B |
|
42 |/ |
|
43 o 0:A |
|
44 |
|
45 warning: conflicts during merge. |
|
46 merging c failed! |
|
47 abort: fix unresolved conflicts with hg resolve then run hg rebase --continue |
|
48 merging c |
|
49 @ 4:C1 |
|
50 | |
|
51 o 3:B bis |
|
52 | |
|
53 | @ 2:C |
|
54 | | |
|
55 | o 1:B |
|
56 |/ |
|
57 o 0:A |
|
58 |
|
59 rebase aborted |
|
60 @ 4:C1 |
|
61 | |
|
62 o 3:B bis |
|
63 | |
|
64 | o 2:C |
|
65 | | |
|
66 | o 1:B |
|
67 |/ |
|
68 o 0:A |
|
69 |