release: remove merge override

This commit is contained in:
rkiel
2017-09-20 22:33:13 -04:00
parent c410028f50
commit 209fcac14d
2 changed files with 2 additions and 8 deletions

View File

@@ -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.

View File

@@ -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