lib/hu/deploy.rb in hu-1.3.11 vs lib/hu/deploy.rb in hu-1.3.12

- old
+ new

@@ -260,10 +260,11 @@ tf.write "#{release_tag}\n#{changelog}" tf.close ENV['EDITOR'] = ENV['GIT_EDITOR'] = "cp #{tf.path}" env = { 'PREVIOUS_TAG' => highest_version, - 'RELEASE_TAG' => release_tag + 'RELEASE_TAG' => release_tag, + 'GIT_MERGE_AUTOEDIT' => 'no' } unless 0 == finish_release(release_tag, env) abort_merge puts '*** ERROR! Could not finish release *** '.color(:red) puts