release: remove merge override

2017-09-20 22:33:13 -04:00
parent c410028f50
commit 209fcac14d
2 changed files with 2 additions and 8 deletions
--- a/lib/feature/merge.rb
+++ b/lib/feature/merge.rb
@@ -4,11 +4,11 @@ module Feature

  class Merge < Feature::Base
    def valid?
-      [1,2].include? argv.size
+      [1].include? argv.size
    end

    def help
-      "feature merge [branch]"
+      "feature merge"
    end

    def execute