# HG changeset patch
# User Ludovic Chabant <ludovic@chabant.com>
# Date 1380260097 25200
# Node ID d190d798773090b3353806bb6323506bebccef4d
# Parent  a273867b6a0d626bfef85a4a3fe92c6bb650c6c0
Use `kdiff3` for merging on MacOS.

diff -r a273867b6a0d -r d190d7987730 hgrc/hgrc-MacOSX
--- a/hgrc/hgrc-MacOSX	Thu Sep 26 22:28:15 2013 -0700
+++ b/hgrc/hgrc-MacOSX	Thu Sep 26 22:34:57 2013 -0700
@@ -1,7 +1,11 @@
-[extdiff]
-cmd.opendiff = opendiff-w
-opts.opendiff =
-
 [ui]
 ssh = ssh -C
+merge = kdiff3
 
+[extdiff]
+cmd.kdiff3 = /Applications/kdiff3.app/Contents/MacOS/kdiff3
+
+[merge-tools]
+kdiff3.executable = /Applications/kdiff3.app/Contents/MacOS/kdiff3
+kdiff3.args = $base $local $other -o $output
+