equal
deleted
inserted
replaced
93 |
93 |
94 # To continue: hg evolve --continue |
94 # To continue: hg evolve --continue |
95 # To abort: hg evolve --abort |
95 # To abort: hg evolve --abort |
96 # To stop: hg evolve --stop |
96 # To stop: hg evolve --stop |
97 # (also see `hg help evolve.interrupted`) |
97 # (also see `hg help evolve.interrupted`) |
|
98 |
|
99 $ hg parents |
|
100 changeset: 6:9c1631e352d9 |
|
101 tag: tip |
|
102 parent: 3:ca1b80f7960a |
|
103 user: test |
|
104 date: Thu Jan 01 00:00:00 1970 +0000 |
|
105 instability: content-divergent |
|
106 summary: added d |
|
107 |
|
108 changeset: 5:e49523854bc8 |
|
109 parent: 3:ca1b80f7960a |
|
110 user: test |
|
111 date: Thu Jan 01 00:00:00 1970 +0000 |
|
112 instability: content-divergent |
|
113 summary: added d |
98 |
114 |
99 |
115 |
100 $ hg evolve --abort |
116 $ hg evolve --abort |
101 evolve aborted |
117 evolve aborted |
102 working directory is now at 9c1631e352d9 |
118 working directory is now at 9c1631e352d9 |