equal
deleted
inserted
replaced
723 ancestor: 924404dff337, local: 0b76e65c8289+, remote: bdb19105162a |
723 ancestor: 924404dff337, local: 0b76e65c8289+, remote: bdb19105162a |
724 local changed a which remote deleted |
724 local changed a which remote deleted |
725 use (c)hanged version or (d)elete? c |
725 use (c)hanged version or (d)elete? c |
726 preserving b for resolve of b |
726 preserving b for resolve of b |
727 preserving rev for resolve of rev |
727 preserving rev for resolve of rev |
728 a: prompt keep -> a |
728 a: prompt keep -> am |
729 b: both created -> m (premerge) |
729 b: both created -> m (premerge) |
730 picked tool 'python ../merge' for b (binary False symlink False) |
730 picked tool 'python ../merge' for b (binary False symlink False) |
731 merging b |
731 merging b |
732 my b@0b76e65c8289+ other b@bdb19105162a ancestor b@000000000000 |
732 my b@0b76e65c8289+ other b@bdb19105162a ancestor b@000000000000 |
733 rev: versions differ -> m (premerge) |
733 rev: versions differ -> m (premerge) |