equal
deleted
inserted
replaced
236 f1.txt: remote created -> g |
236 f1.txt: remote created -> g |
237 getting f1.txt |
237 getting f1.txt |
238 merge against 9:e31216eec445 |
238 merge against 9:e31216eec445 |
239 detach base 8:8e4e2c1a07ae |
239 detach base 8:8e4e2c1a07ae |
240 searching for copies back to rev 3 |
240 searching for copies back to rev 3 |
|
241 unmatched files in other (from topological common ancestor): |
|
242 f2.txt |
241 resolving manifests |
243 resolving manifests |
242 branchmerge: True, force: True, partial: False |
244 branchmerge: True, force: True, partial: False |
243 ancestor: 8e4e2c1a07ae, local: 4bc80088dc6b+, remote: e31216eec445 |
245 ancestor: 8e4e2c1a07ae, local: 4bc80088dc6b+, remote: e31216eec445 |
244 f1.txt: remote is newer -> g |
246 f1.txt: remote is newer -> g |
245 getting f1.txt |
247 getting f1.txt |
253 rebase status stored |
255 rebase status stored |
254 already in target |
256 already in target |
255 merge against 10:2f2496ddf49d |
257 merge against 10:2f2496ddf49d |
256 detach base 9:e31216eec445 |
258 detach base 9:e31216eec445 |
257 searching for copies back to rev 3 |
259 searching for copies back to rev 3 |
|
260 unmatched files in other (from topological common ancestor): |
|
261 f2.txt |
258 resolving manifests |
262 resolving manifests |
259 branchmerge: True, force: True, partial: False |
263 branchmerge: True, force: True, partial: False |
260 ancestor: e31216eec445, local: 19c888675e13+, remote: 2f2496ddf49d |
264 ancestor: e31216eec445, local: 19c888675e13+, remote: 2f2496ddf49d |
261 f1.txt: remote is newer -> g |
265 f1.txt: remote is newer -> g |
262 getting f1.txt |
266 getting f1.txt |