← 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: 2006-06-26 02:01:54 UTC
  • mfrom: (1756.2.29 log.perf)
  • Revision ID: pqm@pqm.ubuntu.com-20060626020154-5f3661f6a543d34d
Remove basis knit support

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
693
693
        if winner == "conflict":
694
694
        # There must be a None in here, if we have a conflict, but we
695
695
        # need executability since file status was not deleted.
696
 
            if self.executable(self.other_tree, file_id) is None:
 
696
            if self.other_tree.is_executable(file_id) is None:
697
697
                winner = "this"
698
698
            else:
699
699
                winner = "other"