~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to __init__.py

  • Committer: Aaron Bentley
  • Date: 2009-03-11 06:44:59 UTC
  • Revision ID: aaron@aaronbentley.com-20090311064459-mez7p4g64e2xz7x9
Implement conflict-diff

Show diffs side-by-side

added added

removed removed

Lines of Context:
31
31
    'cmd_branch_history': [],
32
32
    'cmd_cbranch': [],
33
33
    'cmd_cdiff': [],
 
34
    'cmd_conflict_diff': [],
34
35
    'cmd_fetch_ghosts': ['fetch-missing'],
35
36
    'cmd_graph_ancestry': [],
36
37
    'cmd_import': [],