equal
deleted
inserted
replaced
42 $ hg up -C good |
42 $ hg up -C good |
43 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
43 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
44 $ hg merge |
44 $ hg merge |
45 abort: branch 'default' has 3 heads - please merge with an explicit rev |
45 abort: branch 'default' has 3 heads - please merge with an explicit rev |
46 (run 'hg heads .' to see heads) |
46 (run 'hg heads .' to see heads) |
|
47 [255] |
47 |
48 |
48 close one of the heads |
49 close one of the heads |
49 $ hg up -C 6 |
50 $ hg up -C 6 |
50 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
51 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
51 $ hgcommit -m 'close this head' --close-branch |
52 $ hgcommit -m 'close this head' --close-branch |