/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/textmerge.py

  • Committer: Jelmer Vernooij
  • Date: 2018-05-06 11:48:54 UTC
  • mto: This revision was merged to the branch mainline in revision 6960.
  • Revision ID: jelmer@jelmer.uk-20180506114854-h4qd9ojaqy8wxjsd
Move .mailmap to root.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/textmerge.py
21
21
 
22
22
from .lazy_import import lazy_import
23
23
lazy_import(globals(), """
24
 
import patiencediff
 
24
from breezy import patiencediff
25
25
""")
26
26
 
27
27
 
41
41
    """
42
42
    # TODO: Show some version information (e.g. author, date) on conflicted
43
43
    # regions.
44
 
    A_MARKER = b'<<<<<<< \n'
45
 
    B_MARKER = b'>>>>>>> \n'
46
 
    SPLIT_MARKER = b'=======\n'
47
 
 
 
44
    A_MARKER = '<<<<<<< \n'
 
45
    B_MARKER = '>>>>>>> \n'
 
46
    SPLIT_MARKER = '=======\n'
48
47
    def __init__(self, a_marker=A_MARKER, b_marker=B_MARKER,
49
48
                 split_marker=SPLIT_MARKER):
50
49
        self.a_marker = a_marker
144
143
            # non-matching lines
145
144
            yield(self.lines_a[pos_a:ai], self.lines_b[pos_b:bi])
146
145
            # matching lines
147
 
            yield(self.lines_a[ai:ai + l],)
 
146
            yield(self.lines_a[ai:ai+l],)
148
147
            pos_a = ai + l
149
148
            pos_b = bi + l
150
149
        # final non-matching lines