equal
deleted
inserted
replaced
12 checking for directory renames |
12 checking for directory renames |
13 a: remote moved to c -> m |
13 a: remote moved to c -> m |
14 a: remote moved to b -> m |
14 a: remote moved to b -> m |
15 copying a to b |
15 copying a to b |
16 copying a to c |
16 copying a to c |
|
17 picked tool 'internal:merge' for a (binary False symlink False) |
17 merging a and b |
18 merging a and b |
18 my a@fb3948d97f07+ other b@40da226db0f0 ancestor a@583c7b748052 |
19 my a@fb3948d97f07+ other b@40da226db0f0 ancestor a@583c7b748052 |
|
20 premerge successful |
19 removing a |
21 removing a |
|
22 picked tool 'internal:merge' for a (binary False symlink False) |
20 merging a and c |
23 merging a and c |
21 my a@fb3948d97f07+ other c@40da226db0f0 ancestor a@583c7b748052 |
24 my a@fb3948d97f07+ other c@40da226db0f0 ancestor a@583c7b748052 |
|
25 premerge successful |
22 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
26 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
23 (branch merge, don't forget to commit) |
27 (branch merge, don't forget to commit) |
24 -- b -- |
28 -- b -- |
25 0 |
29 0 |
26 1 |
30 1 |