← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/testmerge3.py

  • Committer: aaron.bentley at utoronto
  • Date: 2005-08-26 06:34:07 UTC
  • mto: (1185.3.4)
  • mto: This revision was merged to the branch mainline in revision 1178.
  • Revision ID: aaron.bentley@utoronto.ca-20050826063406-84d09e206c6c5e73
Shortened conflict markers to 7 characters, to please smerge

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/testmerge3.py
324
324
     The two are the same,
325
325
     But after they are produced,
326
326
       they have different names.
327
 
<<<<<<<< LAO
328
 
========
 
327
<<<<<<< LAO
 
328
=======
329
329
     
330
330
       -- The Way of Lao-Tzu, tr. Wing-tsit Chan
331
331
 
332
 
>>>>>>>> TAO
 
332
>>>>>>> TAO
333
333
""")
334
334
 
335
335