ndiff/nmap conflict

Formula/ndiff.rb

@@ -5,6 +5,8 @@ class Ndiff < Formula
   url 'ftp://ftp.math.utah.edu/pub/misc/ndiff-2.00.tar.gz'
   sha1 'b9ef2eb0de0cd26c3c92e0b3342d0ea4c37e8975'
 
+  conflicts_with 'namp', :because => 'both install `ndiff` binaries'
+
   def install
     ENV.j1
     # Install manually as the `install` make target is crufty

Formula/nmap.rb

@@ -2,14 +2,14 @@ require 'formula'
 
 class Nmap < Formula
   homepage 'http://nmap.org/'
+  head 'https://guest:@svn.nmap.org/nmap/', :using => :svn
   url 'http://nmap.org/dist/nmap-6.40.tar.bz2'
   sha1 'ee1bec1bb62045c7c1fc69ff183b2ae9b97bd0eb'
 
-  head 'https://guest:@svn.nmap.org/nmap/', :using => :svn
-
-  # Leopard's version of OpenSSL isn't new enough
   depends_on "openssl" if MacOS.version <= :leopard
 
+  conflicts_with 'ndiff', :because => 'both install `ndiff` binaries'
+
   fails_with :llvm do
     build 2334
   end