← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/testmerge3.py

  • Committer: Martin Pool
  • Date: 2005-09-13 23:42:32 UTC
  • mto: (1185.8.2) (974.1.91)
  • mto: This revision was merged to the branch mainline in revision 1390.
  • Revision ID: mbp@sourcefrog.net-20050913234232-4d901f2d843a35f3
- ignore .DS_Store by default

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/testmerge3.py
82
82
     The two are the same,
83
83
     But after they are produced,
84
84
       they have different names.
85
 
<<<<<<<< LAO
86
 
========
 
85
<<<<<<< LAO
 
86
=======
87
87
     
88
88
       -- The Way of Lao-Tzu, tr. Wing-tsit Chan
89
89
 
90
 
>>>>>>>> TAO
 
90
>>>>>>> TAO
91
91
""")
92
92
 
93
93
class TestMerge3(TestCase):
221
221
                            start_marker='<<',
222
222
                            mid_marker='--',
223
223
                            end_marker='>>')
224
 
        self.assertEquals(''.join(m3.merge_lines()),
225
 
                          'aaa\n222\nbbb\n')
 
224
        self.assertEquals(''.join(ml), 'aaa\n222\nbbb\n')
 
225
        
226
226
 
227
227
    def test_insert_clash(self):
228
228
        """Both try to insert lines in the same place."""