X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=hgrc.m4;h=8807a90cf12fac0f92a4f8e0a0deb6e29042662c;hb=3b2c5f490a6ed69a4af0d1565eb940028784cf7e;hp=febdc0b6d7d41bf8a8cc052cdd8a7cbc31050e1c;hpb=f72da7852fe0e689875030ec2972f3198be91458;p=config%2Fdotfiles.git

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.