equal
deleted
inserted
replaced
159 $ hg histedit --continue 2>&1 | fixbundle |
159 $ hg histedit --continue 2>&1 | fixbundle |
160 merging e |
160 merging e |
161 warning: conflicts while merging e! (edit, then use 'hg resolve --mark') |
161 warning: conflicts while merging e! (edit, then use 'hg resolve --mark') |
162 Fix up the change (pick 7b4e2f4b7bcd) |
162 Fix up the change (pick 7b4e2f4b7bcd) |
163 (hg histedit --continue to resume) |
163 (hg histedit --continue to resume) |
164 $ hg histedit --continue 2>&1 | fixbundle |
164 We forcibly enable curses here so we can verify that continuing works |
|
165 with curses enabled. |
|
166 $ hg histedit --continue --config ui.interactive=true \ |
|
167 > --config ui.interface=curses 2>&1 | fixbundle |
165 abort: unresolved merge conflicts (see 'hg help resolve') |
168 abort: unresolved merge conflicts (see 'hg help resolve') |
166 |
169 |
167 This failure is caused by 7b4e2f4b7bcd "e" not rebasing the non commutative |
170 This failure is caused by 7b4e2f4b7bcd "e" not rebasing the non commutative |
168 former children. |
171 former children. |
169 |
172 |