gitconfig,hgrc: Drop settings for Mac.

diff --git a/gitconfig.m4 b/gitconfig.m4
index cad62c18c30ea5b58718e3a12ee827c24ef23077..3561376dbf69b69698c4ffecbf2dc6489d8b3434 100644 (file)
--- 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 febdc0b6d7d41bf8a8cc052cdd8a7cbc31050e1c..8807a90cf12fac0f92a4f8e0a0deb6e29042662c 100644 (file)
--- 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.