← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Martin Pool
  • Date: 2006-03-24 11:12:04 UTC
  • mto: This revision was merged to the branch mainline in revision 1626.
  • Revision ID: mbp@sourcefrog.net-20060324111204-447e9b834705153f
New 'weave-plan-merge' and 'weave-merge-text' commands lifted from weave.py

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
2401
2401
# details were needed.
2402
2402
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
2403
2403
from bzrlib.sign_my_commits import cmd_sign_my_commits
2404
 
from bzrlib.weave_commands import cmd_weave_list, cmd_weave_join
 
2404
from bzrlib.weave_commands import cmd_weave_list, cmd_weave_join, \
 
2405
        cmd_weave_plan_merge, cmd_weave_merge_text