Rev 5768: Merge config-concrete-stores into config-section-matchers resolving conflicts in file:///home/vila/src/bzr/experimental/config/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/experimental/config/

------------------------------------------------------------
revno: 5768 [merge]
revision-id: v.ladeuil+lp at free.fr-20110407205638-nem21ib6rh08ykol
parent: v.ladeuil+lp at free.fr-20110407171307-8oaze02li95rpvat
parent: v.ladeuil+lp at free.fr-20110407205500-6z8op5j2tl31a9dt
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: config-section-matchers
timestamp: Thu 2011-04-07 22:56:38 +0200
message:
  Merge config-concrete-stores into config-section-matchers resolving conflicts
modified:
  bzrlib/tests/test_config.py    testconfig.py-20051011041908-742d0c15d8d8c8eb
-------------- next part --------------
=== modified file 'bzrlib/tests/test_config.py'
--- a/bzrlib/tests/test_config.py	2011-04-07 17:13:07 +0000
+++ b/bzrlib/tests/test_config.py	2011-04-07 20:56:38 +0000
@@ -2087,7 +2087,7 @@
     # at possible fallouts for concurrent lockers -- vila 20110-04-06
 
 
-class TestConfigObjStore(tests.TestCaseWithTransport):
+class TestConcreteConfigObjStores(tests.TestCaseWithTransport):
 
     def test_global_store(self):
         store = config.GlobalStore()