← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: John Arbash Meinel
  • Date: 2006-09-20 14:51:03 UTC
  • mfrom: (0.8.23 version_info)
  • mto: This revision was merged to the branch mainline in revision 2028.
  • Revision ID: john@arbash-meinel.com-20060920145103-02725c6d6c886040
[merge] version-info plugin, and cleanup for layout in bzr

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
2905
2905
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
2906
2906
from bzrlib.bundle.commands import cmd_bundle_revisions
2907
2907
from bzrlib.sign_my_commits import cmd_sign_my_commits
 
2908
from bzrlib.version_info import cmd_version_info
2908
2909
from bzrlib.weave_commands import cmd_weave_list, cmd_weave_join, \
2909
2910
        cmd_weave_plan_merge, cmd_weave_merge_text