← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Aaron Bentley
  • Date: 2007-05-18 18:32:14 UTC
  • mto: This revision was merged to the branch mainline in revision 2528.
  • Revision ID: aaron.bentley@utoronto.ca-20070518183214-b7qfkw9z0ou5egmi
Change separator from '/' to 'or'

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py