← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Andrew Bennetts
  • Date: 2010-03-11 04:33:41 UTC
  • mfrom: (4797.33.4 2.1)
  • mto: This revision was merged to the branch mainline in revision 5082.
  • Revision ID: andrew.bennetts@canonical.com-20100311043341-rzdik83fnactjsxs
Merge lp:bzr/2.1, including fixes for #496813, #526211, #526353.

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)))
1177
1176
    def scalar_three_way(this_tree, base_tree, other_tree, file_id, key):
1178
1177
        """Do a three-way test on a scalar.
1179
1178
        Return "this", "other" or "conflict", depending whether a value wins.