equal
deleted
inserted
replaced
68 pulling from ../public |
68 pulling from ../public |
69 searching for changes |
69 searching for changes |
70 no changes found |
70 no changes found |
71 1 new phase-divergent changesets |
71 1 new phase-divergent changesets |
72 |
72 |
73 $ hg evolve -a -A --phasedivergent |
73 $ hg evolve -a -A --phase-divergent |
74 recreate:[2] tweak a |
74 recreate:[2] tweak a |
75 atop:[1] modify a |
75 atop:[1] modify a |
76 computing new diff |
76 computing new diff |
77 committed as 4d1169d82e47 |
77 committed as 4d1169d82e47 |
78 working directory is now at 4d1169d82e47 |
78 working directory is now at 4d1169d82e47 |
120 |/ |
120 |/ |
121 o 1:4d1169d82e47@default(public) modify a |
121 o 1:4d1169d82e47@default(public) modify a |
122 | |
122 | |
123 o 0:d3873e73d99e@default(public) init |
123 o 0:d3873e73d99e@default(public) init |
124 |
124 |
125 $ hg evolve --all --phasedivergent |
125 $ hg evolve --all --phase-divergent |
126 skipping b28e84916d8c : we do not handle merge yet |
126 skipping b28e84916d8c : we do not handle merge yet |