|
@ -3,7 +3,7 @@ class P4merge < Cask |
|
|
homepage 'http://www.perforce.com/product/components/perforce-visual-merge-and-diff-tools' |
|
|
homepage 'http://www.perforce.com/product/components/perforce-visual-merge-and-diff-tools' |
|
|
version '13.1' |
|
|
version '13.1' |
|
|
sha1 'b082af5840282bcff5c2445c586316f72cf71551' |
|
|
sha1 'b082af5840282bcff5c2445c586316f72cf71551' |
|
|
link :app, 'p4merge.app' |
|
|
link 'p4merge.app' |
|
|
|
|
|
|
|
|
def caveats; <<-EOS.undent |
|
|
def caveats; <<-EOS.undent |
|
|
You can set up git to use p4merge as a merge tool by following the instructions available here: |
|
|
You can set up git to use p4merge as a merge tool by following the instructions available here: |
|
|