equal
deleted
inserted
replaced
482 overwrite None partial False |
482 overwrite None partial False |
483 ancestor 924404dff337 local 0b76e65c8289+ remote e03727d2d66b |
483 ancestor 924404dff337 local 0b76e65c8289+ remote e03727d2d66b |
484 searching for copies back to rev 1 |
484 searching for copies back to rev 1 |
485 local changed a which remote deleted |
485 local changed a which remote deleted |
486 use (c)hanged version or (d)elete? c |
486 use (c)hanged version or (d)elete? c |
|
487 a: prompt keep -> a |
487 b: versions differ -> m |
488 b: versions differ -> m |
488 rev: versions differ -> m |
489 rev: versions differ -> m |
489 preserving b for resolve of b |
490 preserving b for resolve of b |
490 preserving rev for resolve of rev |
491 preserving rev for resolve of rev |
491 picked tool 'python ../merge' for b (binary False symlink False) |
492 picked tool 'python ../merge' for b (binary False symlink False) |