equal
deleted
inserted
replaced
28 1a |
28 1a |
29 all copies found (* = to merge, ! = divergent): |
29 all copies found (* = to merge, ! = divergent): |
30 1a -> 1 * |
30 1a -> 1 * |
31 checking for directory renames |
31 checking for directory renames |
32 1a: local moved to 1 -> m |
32 1a: local moved to 1 -> m |
|
33 preserving 1a for resolve of 1a |
33 picked tool 'internal:merge' for 1a (binary False symlink False) |
34 picked tool 'internal:merge' for 1a (binary False symlink False) |
34 merging 1a and 1 |
35 merging 1a and 1 to 1a |
35 my 1a@ac7575e3c052+ other 1@746e9549ea96 ancestor 1@81f4b099af3d |
36 my 1a@ac7575e3c052+ other 1@746e9549ea96 ancestor 1@81f4b099af3d |
36 premerge successful |
37 premerge successful |
37 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
38 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
38 (branch merge, don't forget to commit) |
39 (branch merge, don't forget to commit) |
39 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
40 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
45 1a |
46 1a |
46 all copies found (* = to merge, ! = divergent): |
47 all copies found (* = to merge, ! = divergent): |
47 1a -> 1 * |
48 1a -> 1 * |
48 checking for directory renames |
49 checking for directory renames |
49 1: remote moved to 1a -> m |
50 1: remote moved to 1a -> m |
50 copying 1 to 1a |
51 preserving 1 for resolve of 1a |
51 picked tool 'internal:merge' for 1 (binary False symlink False) |
52 removing 1 |
52 merging 1 and 1a |
53 picked tool 'internal:merge' for 1a (binary False symlink False) |
53 my 1@746e9549ea96+ other 1a@ac7575e3c052 ancestor 1@81f4b099af3d |
54 merging 1 and 1a to 1a |
|
55 my 1a@746e9549ea96+ other 1a@ac7575e3c052 ancestor 1@81f4b099af3d |
54 premerge successful |
56 premerge successful |
55 removing 1 |
|
56 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
57 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
57 (branch merge, don't forget to commit) |
58 (branch merge, don't forget to commit) |