← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-06-18 05:22:35 UTC
  • mfrom: (1551.15.27 Aaron's mergeable stuff)
  • Revision ID: pqm@pqm.ubuntu.com-20070618052235-mvns8j28szyzscy0
Turn list-weave into list-versionedfile

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
3807
3807
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
3808
3808
from bzrlib.bundle.commands import cmd_bundle_revisions
3809
3809
from bzrlib.sign_my_commits import cmd_sign_my_commits
3810
 
from bzrlib.weave_commands import cmd_weave_list, cmd_weave_join, \
 
3810
from bzrlib.weave_commands import cmd_versionedfile_list, cmd_weave_join, \
3811
3811
        cmd_weave_plan_merge, cmd_weave_merge_text