equal
deleted
inserted
replaced
381 ancestor 924404dff337 local 02963e448370+ remote fe905ef2c33e |
381 ancestor 924404dff337 local 02963e448370+ remote fe905ef2c33e |
382 rev: versions differ -> m |
382 rev: versions differ -> m |
383 c: remote created -> g |
383 c: remote created -> g |
384 preserving rev for resolve of rev |
384 preserving rev for resolve of rev |
385 updating: a 1/3 files (33.33%) |
385 updating: a 1/3 files (33.33%) |
386 warning: detected divergent renames of a to: |
386 note: possible conflict - a was renamed multiple times to: |
387 b |
387 b |
388 c |
388 c |
389 updating: c 2/3 files (66.67%) |
389 updating: c 2/3 files (66.67%) |
390 getting c |
390 getting c |
391 updating: rev 3/3 files (100.00%) |
391 updating: rev 3/3 files (100.00%) |