equal
deleted
inserted
replaced
104 |
104 |
105 # To continue: hg evolve --continue |
105 # To continue: hg evolve --continue |
106 # To abort: hg evolve --abort |
106 # To abort: hg evolve --abort |
107 # To stop: hg evolve --stop |
107 # To stop: hg evolve --stop |
108 # (also see `hg help evolve.interrupted`) |
108 # (also see `hg help evolve.interrupted`) |
|
109 |
|
110 |
|
111 $ hg parents |
|
112 changeset: 3:ca1b80f7960a |
|
113 user: test |
|
114 date: Thu Jan 01 00:00:00 1970 +0000 |
|
115 summary: added c |
|
116 |
|
117 changeset: 6:ddba58020bc0 |
|
118 tag: tip |
|
119 parent: 1:c7586e2a9264 |
|
120 user: test |
|
121 date: Thu Jan 01 00:00:00 1970 +0000 |
|
122 instability: phase-divergent |
|
123 summary: added d |
109 |
124 |
110 |
125 |
111 $ hg evolve --abort |
126 $ hg evolve --abort |
112 evolve aborted |
127 evolve aborted |
113 working directory is now at ddba58020bc0 |
128 working directory is now at ddba58020bc0 |