equal
deleted
inserted
replaced
31 bar |
31 bar |
32 all copies found (* = to merge, ! = divergent): |
32 all copies found (* = to merge, ! = divergent): |
33 bar -> foo * |
33 bar -> foo * |
34 checking for directory renames |
34 checking for directory renames |
35 resolving manifests |
35 resolving manifests |
36 overwrite None partial False |
36 overwrite: False, partial: False |
37 ancestor e6dc8efe11cc local 6a0df1dad128+ remote 484bf6903104 |
37 ancestor: e6dc8efe11cc, local: 6a0df1dad128+, remote: 484bf6903104 |
38 foo: versions differ -> m |
38 foo: versions differ -> m |
39 foo: remote copied to bar -> m |
39 foo: remote copied to bar -> m |
40 preserving foo for resolve of bar |
40 preserving foo for resolve of bar |
41 preserving foo for resolve of foo |
41 preserving foo for resolve of foo |
42 updating: foo 1/2 files (50.00%) |
42 updating: foo 1/2 files (50.00%) |