setup.sh: No need to convert hgrc with m4 anymore.

[config/dotfiles.git] / gitconfig.m4

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