equal
deleted
inserted
replaced
692 preserving b for resolve of b |
692 preserving b for resolve of b |
693 preserving rev for resolve of rev |
693 preserving rev for resolve of rev |
694 starting 4 threads for background file closing (?) |
694 starting 4 threads for background file closing (?) |
695 a: prompt deleted/changed -> m (premerge) |
695 a: prompt deleted/changed -> m (premerge) |
696 picked tool ':prompt' for a (binary False symlink False changedelete True) |
696 picked tool ':prompt' for a (binary False symlink False changedelete True) |
697 other changed a which local deleted |
697 other [merge rev] changed a which local [working copy] deleted |
698 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
698 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
699 b: both created -> m (premerge) |
699 b: both created -> m (premerge) |
700 picked tool 'python ../merge' for b (binary False symlink False changedelete False) |
700 picked tool 'python ../merge' for b (binary False symlink False changedelete False) |
701 merging b |
701 merging b |
702 my b@02963e448370+ other b@8dbce441892a ancestor b@000000000000 |
702 my b@02963e448370+ other b@8dbce441892a ancestor b@000000000000 |
737 preserving b for resolve of b |
737 preserving b for resolve of b |
738 preserving rev for resolve of rev |
738 preserving rev for resolve of rev |
739 starting 4 threads for background file closing (?) |
739 starting 4 threads for background file closing (?) |
740 a: prompt changed/deleted -> m (premerge) |
740 a: prompt changed/deleted -> m (premerge) |
741 picked tool ':prompt' for a (binary False symlink False changedelete True) |
741 picked tool ':prompt' for a (binary False symlink False changedelete True) |
742 local changed a which other deleted |
742 local [working copy] changed a which other [merge rev] deleted |
743 use (c)hanged version, (d)elete, or leave (u)nresolved? u |
743 use (c)hanged version, (d)elete, or leave (u)nresolved? u |
744 b: both created -> m (premerge) |
744 b: both created -> m (premerge) |
745 picked tool 'python ../merge' for b (binary False symlink False changedelete False) |
745 picked tool 'python ../merge' for b (binary False symlink False changedelete False) |
746 merging b |
746 merging b |
747 my b@0b76e65c8289+ other b@bdb19105162a ancestor b@000000000000 |
747 my b@0b76e65c8289+ other b@bdb19105162a ancestor b@000000000000 |