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

diff --git a/hgrc.m4 b/hgrc.m4
index e3ef39c..8807a90 100644
--- a/hgrc.m4
+++ b/hgrc.m4
@@ -1,14 +1,26 @@
 # This is the Mercurial configuration file.
 
+# Copyright (C) 2011-2012  Simon Ruderich
+#
+# This file is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This file is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this file.  If not, see <http://www.gnu.org/licenses/>.
+
 
 dnl Load m4 macros.
 include(../lib.m4)
 
 [ui]
 username = Simon Ruderich <simon@ruderich.org>
-ignore = HGIGNORE
-# Use Apple's FileMerge for merge conflicts.
-merge = opendiff-merge
 
 # Use git diffs with support for renames, binaries, access rights, etc.
 [diff]
@@ -34,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.