equal
deleted
inserted
replaced
47 branchmerge: False, force: False, partial: False |
47 branchmerge: False, force: False, partial: False |
48 ancestor: c19d34741b0a, local: c19d34741b0a+, remote: 1e71731e6fbb |
48 ancestor: c19d34741b0a, local: c19d34741b0a+, remote: 1e71731e6fbb |
49 preserving a for resolve of a |
49 preserving a for resolve of a |
50 b: remote created -> g |
50 b: remote created -> g |
51 getting b |
51 getting b |
52 updating: b 1/2 files (50.00%) |
|
53 a: versions differ -> m |
52 a: versions differ -> m |
54 updating: a 2/2 files (100.00%) |
|
55 picked tool 'true' for a (binary False symlink False) |
53 picked tool 'true' for a (binary False symlink False) |
56 merging a |
54 merging a |
57 my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a |
55 my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a |
58 launching merge tool: true *$TESTTMP/r2/a* * (glob) |
56 launching merge tool: true *$TESTTMP/r2/a* * (glob) |
59 merge tool returned: 0 |
57 merge tool returned: 0 |
70 branchmerge: False, force: False, partial: False |
68 branchmerge: False, force: False, partial: False |
71 ancestor: 1e71731e6fbb, local: 1e71731e6fbb+, remote: c19d34741b0a |
69 ancestor: 1e71731e6fbb, local: 1e71731e6fbb+, remote: c19d34741b0a |
72 preserving a for resolve of a |
70 preserving a for resolve of a |
73 b: other deleted -> r |
71 b: other deleted -> r |
74 removing b |
72 removing b |
75 updating: b 1/2 files (50.00%) |
|
76 a: versions differ -> m |
73 a: versions differ -> m |
77 updating: a 2/2 files (100.00%) |
|
78 picked tool 'true' for a (binary False symlink False) |
74 picked tool 'true' for a (binary False symlink False) |
79 merging a |
75 merging a |
80 my a@1e71731e6fbb+ other a@c19d34741b0a ancestor a@1e71731e6fbb |
76 my a@1e71731e6fbb+ other a@c19d34741b0a ancestor a@1e71731e6fbb |
81 launching merge tool: true *$TESTTMP/r2/a* * (glob) |
77 launching merge tool: true *$TESTTMP/r2/a* * (glob) |
82 merge tool returned: 0 |
78 merge tool returned: 0 |
101 branchmerge: False, force: False, partial: False |
97 branchmerge: False, force: False, partial: False |
102 ancestor: c19d34741b0a, local: c19d34741b0a+, remote: 1e71731e6fbb |
98 ancestor: c19d34741b0a, local: c19d34741b0a+, remote: 1e71731e6fbb |
103 preserving a for resolve of a |
99 preserving a for resolve of a |
104 b: remote created -> g |
100 b: remote created -> g |
105 getting b |
101 getting b |
106 updating: b 1/2 files (50.00%) |
|
107 a: versions differ -> m |
102 a: versions differ -> m |
108 updating: a 2/2 files (100.00%) |
|
109 picked tool 'true' for a (binary False symlink False) |
103 picked tool 'true' for a (binary False symlink False) |
110 merging a |
104 merging a |
111 my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a |
105 my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a |
112 launching merge tool: true *$TESTTMP/r2/a* * (glob) |
106 launching merge tool: true *$TESTTMP/r2/a* * (glob) |
113 merge tool returned: 0 |
107 merge tool returned: 0 |