← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/conflicts.py

  • Committer: Andrew Bennetts
  • Date: 2011-06-28 15:28:32 UTC
  • mto: This revision was merged to the branch mainline in revision 5999.
  • Revision ID: andrew.bennetts@canonical.com-20110628152832-xtqkm8phvvvgckaj
Add release-notes entry.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/conflicts.py