~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/textmerge.py

• browse files at revision 1662.1.15
• compare with another revision
• download diff
• download tarball
• view history from revision 1662.1.15

• reverse the comparison (1662.1.15 to 3458)
• stop comparing with revision 3458

Show diffs side-by-side

added

removed

bzrlib/textmerge.py

18

18

#         Aaron Bentley <aaron.bentley@utoronto.ca>

19

19

 

20

20

 

21

 

import bzrlib.patiencediff

 

21

from difflib import SequenceMatcher

22

22

 

23

23

 

24

24

class TextMerge(object):

131

131

        """Return structured merge info.  

132

132

        See TextMerge docstring.

133

133

        """

134

 

        sm = bzrlib.patiencediff.PatienceSequenceMatcher(None, self.lines_a, self.lines_b)

 

134

        sm = SequenceMatcher(None, self.lines_a, self.lines_b)

135

135

        pos_a = 0

136

136

        pos_b = 0

137

137

        for ai, bi, l in sm.get_matching_blocks():

• Older »

Loggerhead is a web-based interface for Breezy
Version: 2.0.1