~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Martin Pool
  • Date: 2005-06-30 06:54:45 UTC
  • mto: This revision was merged to the branch mainline in revision 852.
  • Revision ID: mbp@sourcefrog.net-20050630065445-0b45ffaa34801941
Go back to weave lines normally having newlines at the end. 

Lines without final newlines are now serialized as ',' lines rather
than '.'.

Show diffs side-by-side

added added

removed removed

Lines of Context: