← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/weave.py

  • Committer: Aaron Bentley
  • Date: 2006-02-23 15:12:47 UTC
  • mto: (2027.1.2 revert-subpath-56549)
  • mto: This revision was merged to the branch mainline in revision 1575.
  • Revision ID: abentley@panoramicfeedback.com-20060223151247-9dc5e11197026907
Made weave conflict markers customizable, standardized defaults

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/weave.py
746
746
 
747
747
 
748
748
 
749
 
    def weave_merge(self, plan):
 
749
    def weave_merge(self, plan, a_marker='<<<<<<< \n', b_marker='>>>>>>> \n'):
750
750
        lines_a = []
751
751
        lines_b = []
752
752
        ch_a = ch_b = False
768
768
                elif lines_a == lines_b:
769
769
                    for l in lines_a: yield l
770
770
                else:
771
 
                    yield '<<<<<<<\n'
 
771
                    yield a_marker
772
772
                    for l in lines_a: yield l
773
773
                    yield '=======\n'
774
774
                    for l in lines_b: yield l
775
 
                    yield '>>>>>>>\n'
 
775
                    yield b_marker
776
776
 
777
777
                del lines_a[:]
778
778
                del lines_b[:]