bin/braid in norbert-braid-0.4.12 vs bin/braid in norbert-braid-0.4.13

@@ -52,11 +52,11 @@
     TXT
 
     mixin :argument_url, :option_type, :optional_path, :option_branch, :option_rails_plugin, :option_revision, :option_full, :option_verbose
 
     run {
-      Braid::Operations::VERBOSE = verbose
+      Braid.verbose = verbose
       Braid::Command.run(:add, url, { "type" => type, "path" => path, "branch" => branch, "rails_plugin" => rails_plugin, "revision" => revision, "full" => full })
     }
   }
 
   mode(:update) {
@@ -73,15 +73,15 @@
     examples <<-TXT
       . braid update
       . braid update local/dir
     TXT
 
-    mixin :optional_path, :option_revision, :option_head, :option_safe, :option_verbose
+    mixin :optional_path, :option_revision, :option_head, :option_verbose
 
     run {
-      Braid::Operations::VERBOSE = verbose
-      Braid::Command.run(:update, path, { "revision" => revision, "head" => head , "safe" => safe })
+      Braid.verbose = verbose
+      Braid::Command.run(:update, path, { "revision" => revision, "head" => head })
     }
   }
 
   mode(:remove) {
     description <<-TXT
@@ -97,11 +97,11 @@
     TXT
 
     mixin :argument_path, :option_verbose
 
     run {
-      Braid::Operations::VERBOSE = verbose
+      Braid.verbose = verbose
       Braid::Command.run(:remove, path)
     }
   }
 
   mode(:setup) {
@@ -114,11 +114,11 @@
     TXT
 
     mixin :optional_path, :option_verbose
 
     run {
-      Braid::Operations::VERBOSE = verbose
+      Braid.verbose = verbose
       Braid::Command.run(:setup, path)
     }
   }
 
   mode(:diff) {
@@ -131,11 +131,10 @@
     TXT
 
     mixin :argument_path, :option_verbose
 
     run {
-      Braid::Operations::VERBOSE = verbose
       Braid::Command.run(:diff, path)
     }
   }
 
   mode(:version) {
@@ -214,17 +213,9 @@
       desc 'include mirror history' # FIXME
       attr
     }
   }
 
-  mixin(:option_safe) {
-    option(:safe) {
-      optional
-      desc 'safe on merge errors'
-      attr
-    }
-  }
-  
   mixin(:option_verbose) {
     option(:verbose, :v) {
       optional 
       desc 'log shell commands'
       attr