lib/hu/deploy.rb in hu-1.3.20 vs lib/hu/deploy.rb in hu-1.3.21

@@ -799,10 +799,11 @@
         EOS
       end
 
       def abort_merge
         run_each <<-EOS.strip_heredoc
-        # Abort failed merge
+        :return
+        # Abort failed merge (if any)
         git merge --abort
         EOS
         Hu::Tm.t(:abort_merge, cmd: 'deploy')
       end