← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge_core.py

  • Committer: Martin Pool
  • Date: 2005-09-05 05:35:25 UTC
  • mfrom: (974.1.55)
  • Revision ID: mbp@sourcefrog.net-20050905053525-2112bac069dbe331
- merge various bug fixes from aaron

aaron.bentley@utoronto.ca-20050905020131-a2d5b7711dd6cd98

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()