Use Apple's FileMerge for merge conflicts.

diff --git a/hgrc b/hgrc
index 79c2086da04b8a33c4a6894f121c9d0c3abbfb5f..20d15cfa7a61d1e60267aaf497e499d4ba8db3b6 100644 (file)
--- 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]