equal
deleted
inserted
replaced
160 merging e |
160 merging e |
161 warning: conflicts during merge. |
161 warning: conflicts during merge. |
162 merging e incomplete! (edit conflicts, then use 'hg resolve --mark') |
162 merging e incomplete! (edit conflicts, then use 'hg resolve --mark') |
163 abort: Fix up the change and run hg histedit --continue |
163 abort: Fix up the change and run hg histedit --continue |
164 |
164 |
|
165 This failure is caused by 7b4e2f4b7bcd "e" not rebasing the non commutative |
|
166 former children. |
|
167 |
165 just continue this time |
168 just continue this time |
166 $ hg revert -r 'p1()' e |
169 $ hg revert -r 'p1()' e |
167 $ hg resolve --mark e |
170 $ hg resolve --mark e |
168 $ hg histedit --continue 2>&1 | fixbundle |
171 $ hg histedit --continue 2>&1 | fixbundle |
169 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
172 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |