From 2b7b530bf5a3a75b509878f173b23b9cfb6f7c36 Mon Sep 17 00:00:00 2001
From: phinze <paul.t.hinze@gmail.com>
Date: Sun, 28 Apr 2013 11:13:11 -0500
Subject: [PATCH] add p4merge caveats as recommended in #217

---
 Casks/p4merge.rb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Casks/p4merge.rb b/Casks/p4merge.rb
index ce1f7037b..8be8c3e0b 100644
--- a/Casks/p4merge.rb
+++ b/Casks/p4merge.rb
@@ -5,4 +5,10 @@ class P4merge < Cask
   sha1 'b082af5840282bcff5c2445c586316f72cf71551'
 
   link :app, 'p4merge.app'
+
+  def caveats; <<-EOS.undent
+    You can set up git to use p4merge as a merge tool by following the instructions available here:
+      https://gist.github.com/henrik242/1510148
+    EOS
+  end
 end