ratmat2000 Posted December 11, 2014 Report Share Posted December 11, 2014 Does the beta macplasctic client support the internal diff tool? I can't get the diff tool to work it all. I just get an error message saying no diff tools are defined in client.conf. Link to comment Share on other sites More sharing options...
manu Posted December 11, 2014 Report Share Posted December 11, 2014 Hi! you need to configure them under the Preferences panel. Let me point you some examples: Merge tools: * kdiff3 merge: /Applications/kdiff3.app/Contents/MacOS/kdiff3 -b "@basefile" "@sourcefile" "@destinationfile" -o "@output" * /Applications/Xcode.app/Contents/Applications/FileMerge.app/Contents/MacOS/FileMerge -left @sourcefile -right @destinationfile -ancestor @basefile -merge @output Diff tools: * opendiff @sourcefile @destinationfile * /Applications/Xcode.app/Contents/Applications/FileMerge.app/Contents/MacOS/FileMerge -left @sourcefile -right @destinationfile * kdiff3 diff: /Applications/kdiff3.app/Contents/MacOS/kdiff3 "@sourcefile" "@destinationfile" Link to comment Share on other sites More sharing options...
Recommended Posts
Archived
This topic is now archived and is closed to further replies.