~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/reconcile.py

  • Committer: Aaron Bentley
  • Date: 2006-05-23 21:04:57 UTC
  • mto: (2027.1.2 revert-subpath-56549)
  • mto: This revision was merged to the branch mainline in revision 1731.
  • Revision ID: abentley@panoramicfeedback.com-20060523210457-edf1ddd4daee514b
Test and fix case where name has trailing slash

Show diffs side-by-side

added added

removed removed

Lines of Context: