From: Simon Ruderich <simon@ruderich.org>
Date: Tue, 22 Oct 2013 20:26:31 +0000 (+0200)
Subject: gitconfig,hgrc: Drop settings for Mac.
X-Git-Url: https://ruderich.org/simon/gitweb/?p=config%2Fdotfiles.git;a=commitdiff_plain;h=3b2c5f490a6ed69a4af0d1565eb940028784cf7e

gitconfig,hgrc: Drop settings for Mac.
---

diff --git a/gitconfig.m4 b/gitconfig.m4
index cad62c1..3561376 100644
--- a/gitconfig.m4
+++ b/gitconfig.m4
@@ -174,12 +174,7 @@ include(../lib.m4)
 	textconv = PWD/bin/sqlite3dump
 
 [merge]
-IF(OS, darwin)
-	tool = opendiff
-FI
-IF(OS, debian)
 	tool = vimdiff
-FI
 
 [format]
 	# When using git format-patch use threads and add all patches as
diff --git a/hgrc.m4 b/hgrc.m4
index febdc0b..8807a90 100644
--- a/hgrc.m4
+++ b/hgrc.m4
@@ -21,8 +21,6 @@ include(../lib.m4)
 
 [ui]
 username = Simon Ruderich <simon@ruderich.org>
-# Use Apple's FileMerge for merge conflicts.
-merge = opendiff-merge
 
 # Use git diffs with support for renames, binaries, access rights, etc.
 [diff]
@@ -48,12 +46,7 @@ hgext.transplant =
 
 # Necessary for hg view.
 [hgk]
-IF(OS, debian)
 path = /usr/share/mercurial/hgk
-FI
-IF(OS, darwin)
-path = /opt/local/share/mercurial/contrib/hgk
-FI
 
 [hooks]
 # Precommit hook which runs tests if they exist.