equal
deleted
inserted
replaced
|
1 merging baz and foo |
|
2 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
3 (branch merge, don't forget to commit) |
|
4 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
5 merging foo and baz |
|
6 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
7 (branch merge, don't forget to commit) |
|
8 initializing destination new repository |
|
9 scanning source... |
|
10 sorting... |
|
11 converting... |
|
12 4 add foo bar |
|
13 3 change foo |
|
14 2 make bar and baz copies of foo |
|
15 1 merge local copy |
|
16 0 merge remote copy |
|
17 comparing with ../orig |
|
18 searching for changes |
|
19 no changes found |