diff options
| author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2013-08-16 10:55:05 +0000 |
|---|---|---|
| committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2013-08-16 10:55:05 +0000 |
| commit | 0a5ef89e107c22a5d1931838526fe3b22af42b95 (patch) | |
| tree | a718c4093c41d50407893b6b485a2396c4eaf183 /morphlib/plugins/branch_and_merge_plugin.py | |
| parent | 087fa4c8ea29d722e1cf5ab3a5509fc9c482796b (diff) | |
| parent | e808380a723383f18cf5643b9b813e9f86520e9c (diff) | |
| download | morph-0a5ef89e107c22a5d1931838526fe3b22af42b95.tar.gz | |
Merge branch 'liw/refactor-edit-v2'
Reviewed-by: Richard Maw
Reviewed-by: Daniel Silverstone
Diffstat (limited to 'morphlib/plugins/branch_and_merge_plugin.py')
| -rw-r--r-- | morphlib/plugins/branch_and_merge_plugin.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/morphlib/plugins/branch_and_merge_plugin.py b/morphlib/plugins/branch_and_merge_plugin.py index 62a9f925..38b882a0 100644 --- a/morphlib/plugins/branch_and_merge_plugin.py +++ b/morphlib/plugins/branch_and_merge_plugin.py @@ -59,8 +59,8 @@ class BranchAndMergePlugin(cliapp.Plugin): # User-facing commands self.app.add_subcommand('merge', self.merge, arg_synopsis='BRANCH') - self.app.add_subcommand('edit', self.edit, - arg_synopsis='SYSTEM STRATUM [CHUNK]') +# self.app.add_subcommand('edit', self.edit, +# arg_synopsis='SYSTEM STRATUM [CHUNK]') self.app.add_subcommand('petrify', self.petrify) self.app.add_subcommand('unpetrify', self.unpetrify) self.app.add_subcommand( |