equal
deleted
inserted
replaced
38 Creating phase divergence, resolution of which will lead to conflicts |
38 Creating phase divergence, resolution of which will lead to conflicts |
39 ---------------------------------------------------------------------- |
39 ---------------------------------------------------------------------- |
40 |
40 |
41 $ hg up .^^^ |
41 $ hg up .^^^ |
42 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
42 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
43 $ hg grab -r .~-3 |
43 $ hg pick -r .~-3 |
44 picking 4:c41c793e0ef1 "added d" |
44 picking 4:c41c793e0ef1 "added d" |
45 $ echo foobar > c |
45 $ echo foobar > c |
46 $ hg add c |
46 $ hg add c |
47 $ hg amend |
47 $ hg amend |
48 |
48 |