« back to all changes in this revision
Viewing changes to bzrlib/tests/test_conflicts.py
- Committer: Martin Pool
- Date: 2005-11-29 10:04:14 UTC
- mto: (1185.74.1 bzr.dev (Main development branch)) (1526.1.3 run_tests_twice_for_i18n) (1540.1.3 bzr.dev (Main development branch)) (1505.1.20 bzr-bound-branch) (1685.1.1 bzr-encoding) (1534.1.1 integration) (1553.5.1 bzr.dev (Main development branch)) (1608.2.1 bzr.mbp.escape-stores)
- mto: This revision was merged to the branch mainline in revision 1518.
- Revision ID: mbp@sourcefrog.net-20051129100414-54250ca617c5252c
Remove dead Weave.merge() method (use weave_merge instead)
- files modified:
- bzrlib/weave.py
added
removed
bzrlib/tests/test_conflicts.py
