equal
deleted
inserted
replaced
21 searching for copies back to rev 1 |
21 searching for copies back to rev 1 |
22 unmatched files in other: |
22 unmatched files in other: |
23 b |
23 b |
24 a: versions differ -> m |
24 a: versions differ -> m |
25 b: remote created -> g |
25 b: remote created -> g |
|
26 preserving a for resolve of a |
26 picked tool 'true' for a (binary False symlink False) |
27 picked tool 'true' for a (binary False symlink False) |
27 merging a |
28 merging a |
28 my a@33aaa84a386b+ other a@802f095af299 ancestor a@33aaa84a386b |
29 my a@33aaa84a386b+ other a@802f095af299 ancestor a@33aaa84a386b |
29 getting b |
30 getting b |
30 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
31 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
58 searching for copies back to rev 1 |
59 searching for copies back to rev 1 |
59 unmatched files in other: |
60 unmatched files in other: |
60 b |
61 b |
61 a: versions differ -> m |
62 a: versions differ -> m |
62 b: remote created -> g |
63 b: remote created -> g |
|
64 preserving a for resolve of a |
63 picked tool 'true' for a (binary False symlink False) |
65 picked tool 'true' for a (binary False symlink False) |
64 merging a |
66 merging a |
65 my a@33aaa84a386b+ other a@802f095af299 ancestor a@33aaa84a386b |
67 my a@33aaa84a386b+ other a@802f095af299 ancestor a@33aaa84a386b |
66 getting b |
68 getting b |
67 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
69 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
111 overwrite False partial False |
113 overwrite False partial False |
112 ancestor 33aaa84a386b local 802f095af299+ remote 030602aee63d |
114 ancestor 33aaa84a386b local 802f095af299+ remote 030602aee63d |
113 searching for copies back to rev 1 |
115 searching for copies back to rev 1 |
114 a: versions differ -> m |
116 a: versions differ -> m |
115 b: versions differ -> m |
117 b: versions differ -> m |
|
118 preserving a for resolve of a |
|
119 preserving b for resolve of b |
116 picked tool 'true' for a (binary False symlink False) |
120 picked tool 'true' for a (binary False symlink False) |
117 merging a |
121 merging a |
118 my a@802f095af299+ other a@030602aee63d ancestor a@33aaa84a386b |
122 my a@802f095af299+ other a@030602aee63d ancestor a@33aaa84a386b |
119 picked tool 'true' for b (binary False symlink False) |
123 picked tool 'true' for b (binary False symlink False) |
120 merging b |
124 merging b |