X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=hgrc;h=ee4de5709664cc1e41944a670c746fa5044867fd;hb=b179b88b9659eda769a4aaec76f9b270ee41c000;hp=fb4cff68e9b91095c1b03b733b5e12b16741fdb2;hpb=cddeac1b36a80263970103d684a390f249d90dee;p=config%2Fdotfiles.git

diff --git a/hgrc b/hgrc
index fb4cff6..ee4de57 100644
--- a/hgrc
+++ b/hgrc
@@ -1,11 +1,23 @@
 # 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/>.
+
 
 [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]
@@ -31,7 +43,7 @@ hgext.transplant =
 
 # Necessary for hg view.
 [hgk]
-path = /opt/local/share/mercurial/contrib/hgk
+path = /usr/share/mercurial/hgk
 
 [hooks]
 # Precommit hook which runs tests if they exist.
@@ -45,4 +57,6 @@ preoutgoing.mq-no-push = ! hg qtop > /dev/null 2>&1
 # everything is easily readable in a terminal.
 [pager]
 pager = colordiff | less
-ignore = record, qrecord
+ignore = record, qrecord, view, clone
+
+# vim: ft=cfg