← 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-08-26 00:10:48 UTC
  • Revision ID: mbp@sourcefrog.net-20050826001048-b84148d3ef567d0d
- fix bzr.dev branch url in tutorial
  thanks to madduck

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):
300
300
        self.log('merge result:')
301
301
        self.log(''.join(ml))
302
302
        self.assertEquals(ml, MERGED_RESULT)
 
303
 
 
304
 
 
305
TEST_CLASSES = [ TestMerge3 ]