equal
deleted
inserted
replaced
180 $ HGEDITOR='python editor.py' hg histedit 1 |
180 $ HGEDITOR='python editor.py' hg histedit 1 |
181 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
181 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
182 merging file |
182 merging file |
183 warning: conflicts during merge. |
183 warning: conflicts during merge. |
184 merging file incomplete! (edit conflicts, then use 'hg resolve --mark') |
184 merging file incomplete! (edit conflicts, then use 'hg resolve --mark') |
185 abort: Fix up the change and run hg histedit --continue |
185 Fix up the change and run hg histedit --continue |
186 [255] |
186 [255] |
187 There were conflicts, we keep P1 content. This |
187 There were conflicts, we keep P1 content. This |
188 should effectively drop the changes from +6. |
188 should effectively drop the changes from +6. |
189 $ hg status |
189 $ hg status |
190 M file |
190 M file |
245 $ HGEDITOR="cat $EDITED >" hg histedit 1 |
245 $ HGEDITOR="cat $EDITED >" hg histedit 1 |
246 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
246 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
247 merging file |
247 merging file |
248 warning: conflicts during merge. |
248 warning: conflicts during merge. |
249 merging file incomplete! (edit conflicts, then use 'hg resolve --mark') |
249 merging file incomplete! (edit conflicts, then use 'hg resolve --mark') |
250 abort: Fix up the change and run hg histedit --continue |
250 Fix up the change and run hg histedit --continue |
251 [255] |
251 [255] |
252 $ cat > file << EOF |
252 $ cat > file << EOF |
253 > 1 |
253 > 1 |
254 > 2 |
254 > 2 |
255 > 3 |
255 > 3 |