# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 2015-10-16 09:37:34
# Node ID f6e2e42fb8ef3b729a5bc7c70f7f14e170ae17fe
# Parent  69ac9aebbc55adfc49505b79a283b09226d895f0

mergetools.rc: find OSX FileMerge in the new location inside Xcode 4.3

diff --git a/mercurial/default.d/mergetools.rc b/mercurial/default.d/mergetools.rc
--- a/mercurial/default.d/mergetools.rc
+++ b/mercurial/default.d/mergetools.rc
@@ -88,6 +88,10 @@ filemerge.executable=/Developer/Applicat
 filemerge.args=-left $other -right $local -ancestor $base -merge $output
 filemerge.gui=True
 
+filemergexcode.executable=/Applications/Xcode.app/Contents/Applications/FileMerge.app/Contents/MacOS/FileMerge
+filemergexcode.args=-left $other -right $local -ancestor $base -merge $output
+filemergexcode.gui=True
+
 ; Windows version of Beyond Compare
 beyondcompare3.args=$local $other $base $output /ro /lefttitle=local /centertitle=base /righttitle=other /automerge /reviewconflicts /solo
 beyondcompare3.regkey=Software\Scooter Software\Beyond Compare 3