← 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-07-05 13:02:38 UTC
  • Revision ID: mbp@sourcefrog.net-20050705130238-485f0343122f8ce6
doc

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/testmerge3.py
206
206
    return StringIO(t).readlines()
207
207
 
208
208
 
 
209
 
 
210
############################################################
 
211
# test case from the gnu diffutils manual
 
212
 
209
213
# common base
210
214
TZU = split_lines("""     The Nameless is the origin of Heaven and Earth;
211
215
     The named is the mother of all things.