← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/__init__.py

  • Committer: John Arbash Meinel
  • Date: 2006-03-08 14:38:24 UTC
  • mto: (1685.1.1 bzr-encoding)
  • mto: This revision was merged to the branch mainline in revision 1752.
  • Revision ID: john@arbash-meinel.com-20060308143824-d84504389354bfc1
Removing glob_matcher for the future ignore pattern upgrade.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/__init__.py
937
937
                   'bzrlib.tests.test_doc_generate',
938
938
                   'bzrlib.tests.test_errors',
939
939
                   'bzrlib.tests.test_fetch',
940
 
<<<<<<< TREE
941
940
                   'bzrlib.tests.test_fileid_involved',
942
 
                   'bzrlib.tests.test_glob_matcher',
943
 
=======
944
 
>>>>>>> MERGE-SOURCE
945
941
                   'bzrlib.tests.test_gpg',
946
942
                   'bzrlib.tests.test_graph',
947
943
                   'bzrlib.tests.test_hashcache',