equal
deleted
inserted
replaced
145 |
145 |
146 $ hg amend -m 'added b (2)' |
146 $ hg amend -m 'added b (2)' |
147 1 new unstable changesets |
147 1 new unstable changesets |
148 $ hg next |
148 $ hg next |
149 no children |
149 no children |
|
150 (1 unstable changesets to be evolved here, do you want to evolve?) |
150 [1] |
151 [1] |
151 $ hg evolve |
152 $ hg evolve |
152 move:[2] added c |
153 move:[2] added c |
153 atop:[3] added b (2) |
154 atop:[3] added b (2) |
154 working directory is now at e3b6d5df389b |
155 working directory is now at e3b6d5df389b |
176 |
177 |
177 $ hg am -m 'added b (3)' |
178 $ hg am -m 'added b (3)' |
178 2 new unstable changesets |
179 2 new unstable changesets |
179 $ hg next |
180 $ hg next |
180 no children |
181 no children |
|
182 (2 unstable changesets to be evolved here, do you want to evolve?) |
181 [1] |
183 [1] |
182 $ hg evolve |
184 $ hg evolve |
183 abort: multiple evolve candidates |
185 abort: multiple evolve candidates |
184 (select one of e3b6d5df389b, 9df671ccd2c7 with --rev) |
186 (select one of e3b6d5df389b, 9df671ccd2c7 with --rev) |
185 [255] |
187 [255] |