resolve conflicts

1 files changed, 2 insertions, 2 deletions

diff --git a/minirake b/minirake
index 00a2e6486..430e730cb 100755
--- a/minirake
+++ b/minirake
@@ -277,7 +277,7 @@ module MiniRake
 
     # Run the system command +cmd+.
     def sh(cmd)
-      puts cmd
+      puts cmd if $verbose
       system(cmd) or fail "Command Failed: [#{cmd}]"
     end
 
@@ -418,7 +418,7 @@ class RakeApp
   
   # Read and handle the command line options.
   def handle_options
-    $verbose = true
+    $verbose = false
     opts = GetoptLong.new(*command_line_options)
     opts.each { |opt, value| do_option(opt, value) }
   end