facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2025-01-07 14:10:42 +03:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Mads Kiilerich 2015-10-16 11:37:34 +02:00
parent 8bb79e1017
commit c53290a7f0
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mercurial/default.d/mergetools.rc
View File

@ -88,6 +88,10 @@ filemerge.executable=/Developer/Applications/Utilities/FileMerge.app/Contents/Ma
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