aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Formula/git-flow.rb
diff options
context:
space:
mode:
Diffstat (limited to 'Library/Formula/git-flow.rb')
-rw-r--r--Library/Formula/git-flow.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/Library/Formula/git-flow.rb b/Library/Formula/git-flow.rb
index 2be090a4a..31cd46bd0 100644
--- a/Library/Formula/git-flow.rb
+++ b/Library/Formula/git-flow.rb
@@ -17,6 +17,8 @@ class GitFlow < Formula
head 'https://github.com/nvie/gitflow.git', :branch => 'develop'
+ conflicts_with 'git-flow-avh'
+
def install
system "make", "prefix=#{prefix}", "install"