← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/testmerge3.py

  • Committer: Martin Pool
  • Date: 2005-08-25 08:26:12 UTC
  • Revision ID: mbp@sourcefrog.net-20050825082612-8a1fa6340388eb7f
- fix is_ancestor import problem in merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/testmerge3.py