~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: 2009-01-15 16:31:04 UTC
  • mfrom: (3941.1.1 bzr.integration)
  • Revision ID: pqm@pqm.ubuntu.com-20090115163104-30i51kcr1zepm2f7
(vila) Allows deltas to be filtered by log formatters

Show diffs side-by-side

added added

removed removed

Lines of Context:
1090
1090
                                parent_trans_id, trans_id)
1091
1091
 
1092
1092
    def merge_contents(self, file_id):
1093
 
        """Performa a merge on file_id contents."""
 
1093
        """Performs a merge on file_id contents."""
1094
1094
        def contents_pair(tree):
1095
1095
            if file_id not in tree:
1096
1096
                return (None, None)