← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to __init__.py

  • Committer: aaron.bentley at utoronto
  • Date: 2005-08-27 05:06:27 UTC
  • Revision ID: aaron.bentley@utoronto.ca-20050827050627-b1d857fa4d986f91
Added resolve command

Show diffs side-by-side

added added

removed removed

Lines of Context:
__init__.py
25
25
        clean_tree.clean_tree(ignored=ignored)
26
26
 
27
27
commands = [push.cmd_push, annotate.cmd_annotate, shelf.cmd_shelve, 
28
 
            shelf.cmd_unshelve, cmd_clean_tree, conflicts.cmd_conflicts]
 
28
            shelf.cmd_unshelve, cmd_clean_tree, conflicts.cmd_conflicts,
 
29
            conflicts.cmd_resolve]
29
30
from errors import NoPyBaz
30
31
try:
31
32
    import baz_import