~bzr-pqm/bzr/bzr.dev

  • Committer: Vincent Ladeuil
  • Date: 2010-03-09 15:33:25 UTC
  • mto: (5082.2.1 integration2)
  • 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.
Filename Latest Rev Last Changed Committer Comment Size
..
launchpad 1668.1.8 19 years ago Martin Pool Merge register-branch plugin into default plugins Diff
netrc_credential_store 3757.3.2 16 years ago Vincent Ladeuil Add a credential store for '.netrc'. * plugins/ne Diff
news_merge 4869.3.27 15 years ago Andrew Bennetts Move news_merge plugin from contrib to bzrlib/plug Diff
__init__.py 4183.7.1 16 years ago Sabin Iacob update FSF mailing address 771 bytes Diff Download File