equal
deleted
inserted
replaced
8 adding file changes |
8 adding file changes |
9 added 1 changesets with 1 changes to 1 files (+1 heads) |
9 added 1 changesets with 1 changes to 1 files (+1 heads) |
10 (run 'hg heads' to see heads, 'hg merge' to merge) |
10 (run 'hg heads' to see heads, 'hg merge' to merge) |
11 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
11 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
12 (branch merge, don't forget to commit) |
12 (branch merge, don't forget to commit) |
13 C b |
13 = b |