equal
deleted
inserted
replaced
38 parent: 0:538afb845929 |
38 parent: 0:538afb845929 |
39 commit #0 |
39 commit #0 |
40 branch: default |
40 branch: default |
41 commit: (interrupted update) |
41 commit: (interrupted update) |
42 update: 1 new changesets (update) |
42 update: 1 new changesets (update) |
43 phases: 2 draft (draft) |
43 phases: 2 draft |
44 $ rmdir b |
44 $ rmdir b |
45 $ hg up |
45 $ hg up |
46 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
46 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
47 $ hg sum |
47 $ hg sum |
48 parent: 1:b8bb4a988f25 tip |
48 parent: 1:b8bb4a988f25 tip |
49 commit #1 |
49 commit #1 |
50 branch: default |
50 branch: default |
51 commit: (clean) |
51 commit: (clean) |
52 update: (current) |
52 update: (current) |
53 phases: 2 draft (draft) |
53 phases: 2 draft |
54 |
54 |
55 Prepare a basic merge |
55 Prepare a basic merge |
56 |
56 |
57 $ hg up 0 |
57 $ hg up 0 |
58 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
58 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |