equal
deleted
inserted
replaced
17 merging for foo |
17 merging for foo |
18 resolving manifests |
18 resolving manifests |
19 getting bar |
19 getting bar |
20 merging foo |
20 merging foo |
21 resolving foo |
21 resolving foo |
|
22 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
23 (branch merge, don't forget to commit) |
22 we shouldn't have anything but foo in merge state here |
24 we shouldn't have anything but foo in merge state here |
23 m 644 3 foo |
25 m 644 3 foo |
24 main: we should have a merge here |
26 main: we should have a merge here |
25 rev offset length base linkrev nodeid p1 p2 |
27 rev offset length base linkrev nodeid p1 p2 |
26 0 0 73 0 0 cdca01651b96 000000000000 000000000000 |
28 0 0 73 0 0 cdca01651b96 000000000000 000000000000 |