← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-03-11 09:56:45 UTC
  • mfrom: (5082.2.1 integration2)
  • Revision ID: pqm@pqm.ubuntu.com-20100311095645-31r1d2xx0ez23lku
(vila) Deprecate bzrlib.merge.Merge3Merger.scalar_three_way

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
1173
1173
        return 'conflict'
1174
1174
 
1175
1175
    @staticmethod
 
1176
    @deprecated_method(deprecated_in((2, 2, 0)))
1176
1177
    def scalar_three_way(this_tree, base_tree, other_tree, file_id, key):
1177
1178
        """Do a three-way test on a scalar.
1178
1179
        Return "this", "other" or "conflict", depending whether a value wins.