equal
deleted
inserted
replaced
83 discovered dir src: 'a/' -> dst: 'b/' |
83 discovered dir src: 'a/' -> dst: 'b/' |
84 pending file src: 'a/c' -> dst: 'b/c' |
84 pending file src: 'a/c' -> dst: 'b/c' |
85 resolving manifests |
85 resolving manifests |
86 branchmerge: True, force: False, partial: False |
86 branchmerge: True, force: False, partial: False |
87 ancestor: f9b20c0d4c51, local: 397f8b00a740+, remote: ce36d17b18fb |
87 ancestor: f9b20c0d4c51, local: 397f8b00a740+, remote: ce36d17b18fb |
|
88 starting 4 threads for background file closing (?) |
88 b/c: local directory rename - get from a/c -> dg |
89 b/c: local directory rename - get from a/c -> dg |
89 getting a/c to b/c |
90 getting a/c to b/c |
90 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
91 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
91 (branch merge, don't forget to commit) |
92 (branch merge, don't forget to commit) |
92 |
93 |