equal
deleted
inserted
replaced
494 With markers enabled, histedit does not get confused, and |
494 With markers enabled, histedit does not get confused, and |
495 amend should not be blocked by the ongoing histedit. |
495 amend should not be blocked by the ongoing histedit. |
496 |
496 |
497 $ cat >>$HGRCPATH <<EOF |
497 $ cat >>$HGRCPATH <<EOF |
498 > [experimental] |
498 > [experimental] |
499 > evolution=allowunstable |
|
500 > evolution.createmarkers=True |
499 > evolution.createmarkers=True |
|
500 > evolution.allowunstable=True |
501 > EOF |
501 > EOF |
502 $ hg commit --amend -m 'allow this fold' |
502 $ hg commit --amend -m 'allow this fold' |
503 $ hg histedit --continue |
503 $ hg histedit --continue |
504 |
504 |
505 $ cd .. |
505 $ cd .. |