# 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]
# 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.
# everything is easily readable in a terminal.
[pager]
pager = colordiff | less
-ignore = record, qrecord
+ignore = record, qrecord, view, clone
+
+# vim: ft=cfg