Mercurial > dotfiles

changeset 132:d190d7987730

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use `kdiff3` for merging on MacOS.
author Ludovic Chabant <ludovic@chabant.com>
date Thu, 26 Sep 2013 22:34:57 -0700
parents a273867b6a0d
children a9b32a49d0bd
files hgrc/hgrc-MacOSX
diffstat 1 files changed, 8 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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
+