~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/textmerge.py

Indicate conflicts from merge_lines, insead of guessing

Show diffs side-by-side

added added

removed removed

Lines of Context:
55
55
 
56
56
    def merge_lines(self, reprocess=False):
57
57
        struct = []
 
58
        conflicts = False
58
59
        for group in self.merge_struct(reprocess):
59
60
            struct.append(group)
60
 
        return self.struct_to_lines(struct)
 
61
            if len(group) > 1:
 
62
                conflicts = True
 
63
        return self.struct_to_lines(struct), conflicts
61
64
 
62
65
    def merge_struct(self, reprocess=False):
63
66
        struct_iter = self.iter_useful(self._merge_struct())