equal
deleted
inserted
replaced
17 (run 'hg heads' to see heads, 'hg merge' to merge) |
17 (run 'hg heads' to see heads, 'hg merge' to merge) |
18 merging for foo |
18 merging for foo |
19 resolving manifests |
19 resolving manifests |
20 getting bar |
20 getting bar |
21 merging foo |
21 merging foo |
22 resolving foo |
|
23 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
22 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
24 (branch merge, don't forget to commit) |
23 (branch merge, don't forget to commit) |
25 we shouldn't have anything but foo in merge state here |
24 we shouldn't have anything but foo in merge state here |
26 m 644 3 foo |
25 m 644 3 foo |
27 main: we should have a merge here |
26 main: we should have a merge here |