From fd7154d91cf8e48c2500868bfd16dae77fefc7e6 Mon Sep 17 00:00:00 2001 From: Dan Martinez Date: Tue, 29 Dec 2015 10:41:21 -0800 Subject: [PATCH] colordiff: fix missing `conflict` with `cdiff` Closes Homebrew/homebrew#47504. Signed-off-by: Andrew Janke --- Formula/colordiff.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Formula/colordiff.rb b/Formula/colordiff.rb index b3e7cd86a1..c4f2de1382 100644 --- a/Formula/colordiff.rb +++ b/Formula/colordiff.rb @@ -11,6 +11,8 @@ class Colordiff < Formula sha256 "386b872c9ce130d237efcf4874c4e06582e56bc243fe89c7cd355e72f6d0f048" => :mavericks end + conflicts_with "cdiff", :because => "both install `cdiff` binaries" + patch :DATA def install