Viewing all changes in revision 5077.2.1.
- 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 modified:
- bzrlib/merge.py
expand all
collapse all
added
removed
