equal
deleted
inserted
replaced
104 $ hg ci -m "merged bb" |
104 $ hg ci -m "merged bb" |
105 |
105 |
106 create instability by pruning two changesets, one in a topic, one in a merge |
106 create instability by pruning two changesets, one in a topic, one in a merge |
107 $ hg prune -r 5:6 |
107 $ hg prune -r 5:6 |
108 2 changesets pruned |
108 2 changesets pruned |
109 3 new orphan changesets |
|
110 |
109 |
111 $ hg up 4 |
110 $ hg up 4 |
112 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
111 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
113 |
112 |
114 start the evolve |
113 start the evolve |