Rev 4626: Fix typos, tests passing. in file:///home/vila/src/bzr/experimental/conflict-manager/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/experimental/conflict-manager/

------------------------------------------------------------
revno: 4626
revision-id: v.ladeuil+lp at free.fr-20100303162941-n9lv31fgbi61iqrk
parent: v.ladeuil+lp at free.fr-20100303131355-lkivtt0s1q1ljy5t
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: cleanup
timestamp: Wed 2010-03-03 17:29:41 +0100
message:
  Fix typos, tests passing.
-------------- next part --------------
=== modified file 'bzrlib/tests/test_conflicts.py'
--- a/bzrlib/tests/test_conflicts.py	2010-03-03 13:13:55 +0000
+++ b/bzrlib/tests/test_conflicts.py	2010-03-03 16:29:41 +0000
@@ -224,15 +224,15 @@
             ('%s,%s' % (t, o),
              dict(_this_actions=d['_this_actions'],
                   _check_this=d['_check_this'],
-                  _other_actions=['_other_actions'],
-                  _check_other=['_check_other'],
+                  _other_actions=d['_other_actions'],
+                  _check_other=d['_check_other'],
                   )))
         scenarios.append(
             ('%s,%s' % (o, t),
              dict(_this_actions=d['_other_actions'],
                   _check_this=d['_check_other'],
-                  _other_actions=['_this_actions'],
-                  _check_other=['_check_this'],
+                  _other_actions=d['_this_actions'],
+                  _check_other=d['_check_this'],
                   )))
     return scenarios