equal
deleted
inserted
replaced
8 adding changesets |
8 adding changesets |
9 adding manifests |
9 adding manifests |
10 adding file changes |
10 adding file changes |
11 added 1 changesets with 1 changes to 1 files (+1 heads) |
11 added 1 changesets with 1 changes to 1 files (+1 heads) |
12 (run 'hg heads' to see heads, 'hg merge' to merge) |
12 (run 'hg heads' to see heads, 'hg merge' to merge) |
13 merging a/f and b/f |
13 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
14 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
15 (branch merge, don't forget to commit) |
14 (branch merge, don't forget to commit) |
16 M b/f |
15 M b/f |
17 a/f |
|
18 A b/aa/g |
16 A b/aa/g |
19 a/aa/g |
17 a/aa/g |
20 R a/aa/g |
18 R a/aa/g |
21 R a/f |
19 R a/f |