equal
deleted
inserted
replaced
9 |/ |
9 |/ |
10 o 0: A |
10 o 0: A |
11 |
11 |
12 |
12 |
13 % - Rebasing B onto E |
13 % - Rebasing B onto E |
14 merging A |
|
15 warning: conflicts during merge. |
14 warning: conflicts during merge. |
16 merging A failed! |
15 merging A failed! |
17 abort: fix unresolved conflicts with hg resolve then run hg rebase --continue |
16 abort: fix unresolved conflicts with hg resolve then run hg rebase --continue |
|
17 merging A |
18 |
18 |
19 % - Force a commit on C during the interruption |
19 % - Force a commit on C during the interruption |
20 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
20 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
21 @ 6: Extra |
21 @ 6: Extra |
22 | |
22 | |
71 |/ |
71 |/ |
72 o 0: A |
72 o 0: A |
73 |
73 |
74 |
74 |
75 % Rebasing B onto E |
75 % Rebasing B onto E |
76 merging A |
|
77 warning: conflicts during merge. |
76 warning: conflicts during merge. |
78 merging A failed! |
77 merging A failed! |
79 abort: fix unresolved conflicts with hg resolve then run hg rebase --continue |
78 abort: fix unresolved conflicts with hg resolve then run hg rebase --continue |
|
79 merging A |
80 |
80 |
81 % Force a commit on B' during the interruption |
81 % Force a commit on B' during the interruption |
82 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
82 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
83 @ 6: Extra |
83 @ 6: Extra |
84 | |
84 | |