Enable hg view through hgk extension.

[config/dotfiles.git] / hgrc

diff --git a/hgrc b/hgrc
index 56a1c0a9f70de06802ac0853bf692fcd0ce8c9d7..25860a77f8cd37b44a388ce764ff7f2eb365d29b 100644 (file)
--- a/hgrc
+++ b/hgrc
@@ -3,17 +3,30 @@
 
 [ui]
 username = Simon Ruderich <simon@ruderich.com>
+ignore = ~/.hgignore
+# Use Apple's FileMerge for merge conflicts.
+merge = opendiff-merge
+
+# Use git diffs with support for renames, binaries, access rights, etc.
+[diff]
+git = True
 
 [extensions]
 # Convert other vcs to mercurial.
 hgext.convert =
 # Simplify pull and merge processes.
 hgext.fetch =
+# Enable hg view.
+hgext.hgk =
 # Patch stack support.
 hgext.mq =
 # Partial commit utility.
 hgext.record =
 
+# Necessary for hg view.
+[hgk]
+path = /opt/local/share/mercurial/contrib/hgk
+
 [hooks]
 # Precommit hook which runs tests if they exist.
 precommit = precommit-runtests