equal
deleted
inserted
replaced
41 ancestor: f9b20c0d4c51, local: ce36d17b18fb+, remote: 397f8b00a740 |
41 ancestor: f9b20c0d4c51, local: ce36d17b18fb+, remote: 397f8b00a740 |
42 a/a: other deleted -> r |
42 a/a: other deleted -> r |
43 removing a/a |
43 removing a/a |
44 a/b: other deleted -> r |
44 a/b: other deleted -> r |
45 removing a/b |
45 removing a/b |
46 updating: a/b 2/5 files (40.00%) |
|
47 b/a: remote created -> g |
46 b/a: remote created -> g |
48 getting b/a |
47 getting b/a |
49 b/b: remote created -> g |
48 b/b: remote created -> g |
50 getting b/b |
49 getting b/b |
51 updating: b/b 4/5 files (80.00%) |
|
52 b/c: remote directory rename - move from a/c -> dm |
50 b/c: remote directory rename - move from a/c -> dm |
53 updating: b/c 5/5 files (100.00%) |
|
54 moving a/c to b/c (glob) |
51 moving a/c to b/c (glob) |
55 3 files updated, 0 files merged, 2 files removed, 0 files unresolved |
52 3 files updated, 0 files merged, 2 files removed, 0 files unresolved |
56 (branch merge, don't forget to commit) |
53 (branch merge, don't forget to commit) |
57 |
54 |
58 $ echo a/* b/* |
55 $ echo a/* b/* |
87 pending file src: 'a/c' -> dst: 'b/c' |
84 pending file src: 'a/c' -> dst: 'b/c' |
88 resolving manifests |
85 resolving manifests |
89 branchmerge: True, force: False, partial: False |
86 branchmerge: True, force: False, partial: False |
90 ancestor: f9b20c0d4c51, local: 397f8b00a740+, remote: ce36d17b18fb |
87 ancestor: f9b20c0d4c51, local: 397f8b00a740+, remote: ce36d17b18fb |
91 b/c: local directory rename - get from a/c -> dg |
88 b/c: local directory rename - get from a/c -> dg |
92 updating: b/c 1/1 files (100.00%) |
|
93 getting a/c to b/c |
89 getting a/c to b/c |
94 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
90 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
95 (branch merge, don't forget to commit) |
91 (branch merge, don't forget to commit) |
96 |
92 |
97 $ echo a/* b/* |
93 $ echo a/* b/* |