Viewing all changes in revision 4797.9.1.
- Committer: Vincent Ladeuil
- Date: 2010-02-01 17:29:44 UTC
- mto: (4797.10.1 2.1)
- mto: This revision was merged to the branch mainline in revision 5000.
- Revision ID: v.ladeuil+lp@free.fr-20100201172944-u41q2lw8jehlojv5
No test was exercising the faulty code path.
* bzrlib/tests/test_merge.py:
(TestConfigurableFileMerger.test_affected_files_cached.SimplePlan):
Make the test really do something to at least provide a minimal
coverage.
* bzrlib/merge.py:
(ConfigurableFileMerger.merge_contents): Fix typo.
* bzrlib/tests/test_merge.py:
(TestConfigurableFileMerger.test_affected_files_cached.SimplePlan):
Make the test really do something to at least provide a minimal
coverage.
* bzrlib/merge.py:
(ConfigurableFileMerger.merge_contents): Fix typo.
- files modified:
- NEWS
expand all
collapse all
added
removed
