← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

Merge cleanups into refactor-delta-show

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
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)