« back to all changes in this revision
Viewing changes to bzrlib/externalcommand.py
- Committer: Vincent Ladeuil
- Date: 2010-03-09 15:33:25 UTC
- mto: (5082.2.1 integration2)
- mto: This revision was merged to the branch mainline in revision 5084.
- Revision ID: v.ladeuil+lp@free.fr-20100309153325-w16djg6tbkt0905a
Deprecate Merge3Merger.scalar_three_way.
* bzrlib/merge.py:
(Merge3Merger.scalar_three_way): Deprecated, not used in the
current code base, skimming history seem to reveal it hasn't been
used for quite a long time.
* bzrlib/merge.py:
(Merge3Merger.scalar_three_way): Deprecated, not used in the
current code base, skimming history seem to reveal it hasn't been
used for quite a long time.
- files removed:
- bzrlib/tests/blackbox/test_rmbranch.py
- bzrlib/tests/per_bzrdir_colo
- files renamed:
- apport/ => contrib/apport/
- apport/bzr-crashdb.conf => contrib/apport/bzr.conf
- files modified:
- .bzrignore
added
removed
bzrlib/externalcommand.py
