← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge3.py

Merge from integration.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge3.py
277
277
    
278
278
 
279
279
    def reprocess_merge_regions(self, merge_regions):
 
280
        """Where there are conflict regions, remove the agreed lines.
 
281
 
 
282
        Lines where both A and B have made the same changes are 
 
283
        eliminated.
 
284
        """
280
285
        for region in merge_regions:
281
286
            if region[0] != "conflict":
282
287
                yield region