From 209fcac14dbb581592a43e4bc43ea1df92eca7b0 Mon Sep 17 00:00:00 2001
From: rkiel <cygnus@pobox.com>
Date: Wed, 20 Sep 2017 22:33:13 -0400
Subject: [PATCH] release: remove merge override

---
 FEATURE.md           | 6 ------
 lib/feature/merge.rb | 4 ++--
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/FEATURE.md b/FEATURE.md
index 65a710b..2a5a981 100644
--- a/FEATURE.md
+++ b/FEATURE.md
@@ -79,12 +79,6 @@ Use the `merge` subcommand to merge your feature branch changes to the standard
 feature merge
 ```
 
-You can also override the default standard branch by specifying another branch.
-
-```
-feature merge integration
-```
-
 #### End
 
 Use the `end` subcommand to safely close out the feature.
diff --git a/lib/feature/merge.rb b/lib/feature/merge.rb
index 3c962ba..f009dc8 100644
--- 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