equal
deleted
inserted
replaced
32 date: Thu Jan 01 00:00:00 1970 +0000 |
32 date: Thu Jan 01 00:00:00 1970 +0000 |
33 summary: b |
33 summary: b |
34 |
34 |
35 $ hg up 1e6c11564562 |
35 $ hg up 1e6c11564562 |
36 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
36 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
37 (leaving bookmark main) |
37 $ hg merge main |
38 $ hg merge main |
38 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
39 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
39 (branch merge, don't forget to commit) |
40 (branch merge, don't forget to commit) |
40 $ hg book |
41 $ hg book |
41 main 2:d36c0562f908 |
42 main 2:d36c0562f908 |