diff options
| author | Mike McQuaid | 2017-05-16 08:45:45 +0100 | 
|---|---|---|
| committer | GitHub | 2017-05-16 08:45:45 +0100 | 
| commit | aeaf9af711e1c76f93ab8cf827e18198d42cc56f (patch) | |
| tree | f55178369c9187ce8fd19e72b8a74a73dc0cd8c9 /Library/Homebrew/formula.rb | |
| parent | ea8be174f6009bc9bdec67b13ca501b5b83fc4b8 (diff) | |
| parent | 8e2198ff018548df6aa0854f22a111bacee081a7 (diff) | |
| download | brew-aeaf9af711e1c76f93ab8cf827e18198d42cc56f.tar.bz2 | |
Merge pull request #2470 from johnhawkinson/conflicts-info
Display formula conflict reasons
Diffstat (limited to 'Library/Homebrew/formula.rb')
| -rw-r--r-- | Library/Homebrew/formula.rb | 2 | 
1 files changed, 1 insertions, 1 deletions
| diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb index 1b3b718da..1230199bf 100644 --- a/Library/Homebrew/formula.rb +++ b/Library/Homebrew/formula.rb @@ -2366,7 +2366,7 @@ class Formula      end      # If this formula conflicts with another one. -    # <pre>conflicts_with "imagemagick", :because => "because this is just a stupid example"</pre> +    # <pre>conflicts_with "imagemagick", :because => "because both install 'convert' binaries"</pre>      def conflicts_with(*names)        opts = names.last.is_a?(Hash) ? names.pop : {}        names.each { |name| conflicts << FormulaConflict.new(name, opts[:because]) } | 
