Mercurial > hg
changeset 26733:f6e2e42fb8ef
mergetools.rc: find OSX FileMerge in the new location inside Xcode 4.3
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Fri, 16 Oct 2015 11:37:34 +0200 |
| parents | 69ac9aebbc55 |
| children | b000d34f863f |
| files | mercurial/default.d/mergetools.rc |
| diffstat | 1 files changed, 4 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/default.d/mergetools.rc Thu Oct 15 14:53:32 2015 -0700 +++ b/mercurial/default.d/mergetools.rc Fri Oct 16 11:37:34 2015 +0200 @@ -88,6 +88,10 @@ 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