| branch | stable |
| changeset 11882 | b75dea24e296 |
| parent 11650 | ebaf117c2642 |
| child 11886 | 73112cb2a6d7 |
| child 12320 | 40c40c6f20b8 |
| 11881:2da0cf99b642 | 11882:b75dea24e296 |
|---|---|
154 5 |
154 5 |
155 % log 'merge()' |
155 % log 'merge()' |
156 6 |
156 6 |
157 % log 'modifies(b)' |
157 % log 'modifies(b)' |
158 4 |
158 4 |
159 % log 'outgoing()' |
|
160 8 |
|
161 9 |
|
162 % log 'outgoing("../remote1")' |
|
163 8 |
|
164 9 |
|
165 % log 'outgoing("../remote2")' |
|
166 3 |
|
167 5 |
|
168 6 |
|
169 7 |
|
170 9 |
|
159 % log 'p1(merge())' |
171 % log 'p1(merge())' |
160 5 |
172 5 |
161 % log 'p2(merge())' |
173 % log 'p2(merge())' |
162 4 |
174 4 |
163 % log 'parents(merge())' |
175 % log 'parents(merge())' |