Merge pull request #9251 from vitorgalvao/conflicts_with-substitution

`conflicts_with` substitution

Casks/macvim.rb

@@ -30,12 +30,5 @@ cask :v1 => 'macvim' do
                   '~/Library/Preferences/org.vim.MacVim.plist',
                  ]
 
-  caveats do
-    files_in_usr_local
-    <<-EOS.undent
-      Note that homebrew also provides a compiled macvim Formula that links its
-      binary to /usr/local/bin/mvim. It's not recommended to install both the
-      Cask and the Formula of MacVim.
-    EOS
-  end
+  conflicts_with :formula => 'macvim'
 end

Casks/pandoc.rb

@@ -12,9 +12,6 @@ cask :v1 => 'pandoc' do
   pkg "pandoc-#{version}-osx.pkg"
 
   uninstall :pkgutil => 'net.johnmacfarlane.pandoc'
-  caveats <<-EOS.undent
-    Note that homebrew also provides a compiled pandoc Formula that links its
-    binary to /usr/local/bin/pandoc. It's not recommended to install both the
-    Cask and the Formula of Pandoc.
-  EOS
+
+  conflicts_with :formula => 'pandoc'
 end