aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Formula
diff options
context:
space:
mode:
authorJordi GutiƩrrez Hermoso2014-05-23 15:43:00 -0400
committerMisty De Meo2014-05-29 23:41:57 -0700
commit8510ebcdb6907498439d685e2abd74c706045c29 (patch)
tree9e3658174595bcb0c0127338c10e26c92099497f /Library/Formula
parent0b863c3008ec32411b3bd7f020feaa8c0f7e81cc (diff)
downloadhomebrew-8510ebcdb6907498439d685e2abd74c706045c29.tar.bz2
mercurial: install mergetools
Closes #29529. Signed-off-by: Misty De Meo <mistydemeo@gmail.com>
Diffstat (limited to 'Library/Formula')
-rw-r--r--Library/Formula/mercurial.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/Library/Formula/mercurial.rb b/Library/Formula/mercurial.rb
index d8b0b384a..a63660cb1 100644
--- a/Library/Formula/mercurial.rb
+++ b/Library/Formula/mercurial.rb
@@ -19,6 +19,10 @@ class Mercurial < Formula
# install the completion scripts
bash_completion.install 'contrib/bash_completion' => 'hg-completion.bash'
zsh_completion.install 'contrib/zsh_completion' => '_hg'
+
+ # install the merge tool default configs
+ # http://mercurial.selenic.com/wiki/Packaging#Things_to_note
+ (etc/"mercurial"/"hgrc.d").install "contrib/mergetools.hgrc" => "mergetools.rc"
end
test do