X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=hgrc;h=25860a77f8cd37b44a388ce764ff7f2eb365d29b;hb=05048fade2bb0f0f5a0ca656a76269849e25dab7;hp=79c2086da04b8a33c4a6894f121c9d0c3abbfb5f;hpb=96ed5be590e78a88ec31837dd39c993a8a623ca0;p=config%2Fdotfiles.git

diff --git a/hgrc b/hgrc
index 79c2086..25860a7 100644
--- a/hgrc
+++ b/hgrc
@@ -4,6 +4,8 @@
 [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]
@@ -14,11 +16,17 @@ git = True
 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