← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge_core.py

  • Committer: Robert Collins
  • Date: 2005-09-06 11:09:03 UTC
  • mfrom: (1178)
  • mto: (1185.1.10) (1092.3.1)
  • mto: This revision was merged to the branch mainline in revision 1390.
  • Revision ID: robertc@robertcollins.net-20050906110903-b6be7bd6102403cb
really merge mpool

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge_core.py
45
45
                       start_marker=start_marker):
46
46
            if line.startswith(start_marker):
47
47
                new_conflicts = True
48
 
                output_file.write(line.replace(start_marker, '<<<<<<<<'))
 
48
                output_file.write(line.replace(start_marker, '<' * 7))
49
49
            else:
50
50
                output_file.write(line)
51
51
        output_file.close()