← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge3.py

  • Committer: Robert Collins
  • Date: 2005-10-19 11:54:59 UTC
  • mfrom: (1464.1.1)
  • Revision ID: robertc@robertcollins.net-20051019115459-a850274afcf87734
merge from Martin, via newformat, and teach sftp about urlescaped paths

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge3.py
76
76
    def merge_lines(self,
77
77
                    name_a=None,
78
78
                    name_b=None,
79
 
                    start_marker='<<<<<<<<',
80
 
                    mid_marker='========',
81
 
                    end_marker='>>>>>>>>',
 
79
                    start_marker='<<<<<<<',
 
80
                    mid_marker='=======',
 
81
                    end_marker='>>>>>>>',
82
82
                    show_base=False):
83
83
        """Return merge in cvs-like form.
84
84
        """