← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge3.py

  • Committer: Martin Pool
  • Date: 2005-04-15 09:33:28 UTC
  • Revision ID: mbp@sourcefrog.net-20050415093328-94d142b1130b3d2c
- Better workaround for trailing newlines in diffs

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge3.py