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