How to setup the 'Comparator' plugin ?

With FileMerge from XCode

• Install XCode
• Open it (at least one time) to accept the license agreement
• Define the path to XCode XCode:

  sudo xcode-select -switch /Applications/Xcode.app

• try it in terminal

  sudo /usr/bin/opendiff

  if the setup is good, this should respond 'too few arguments'

With Kaleidoscope from BlackPixel

• Install Kaleidoscope
• Open it and go to "Kaleidoscope>Integration" to install 'Command lines tool ksdiff'

With TextWrangler's diff from Barebones

• Install TextWrangler
• Open it and go to menu "TextWrangler>Install Command lines tool'
• Test it in Terminal with

  /usr/local/bin/twdiff file1 file2

With other supported tool

• Select it in the Menu 'Plugins -> Comparator -> Choose DiffTool'

How to add another diff tool

• Install your tool (and CLI)
• Create a shell script that execute your tool with the parameters to open the left and right files files in $HOME/codaConfig/CodaCompareFile_*.tmp
• Make it executable
• Create a symlink to replace the default tool used by comparator

  sudo ln -s /tmp/yourscript.sh /usr/local/bin/codacomparediff

How to use 'Comparator' plugin?

1. Open the first file to compare

Menu 'Plug-ins -> Comparator -> Use to Compare Left' (or cmd+1)

2. Open the second file to compare (not necessarily on the same Coda instance)

Menu 'Plug-ins -> Comparator -> Use to Compare Right' (or cmd+2)

3. Open the diff tool to Compare

   Menu 'Plug-ins -> Comparator -> Compare (Left & Right)' (or cmd+#)

4. Make your choices between Left & Right differences [and 'Save' the merge (or cmd+s)]

5. Open the file in which you want to import the result and replace his content

   Menu 'Plug-ins -> Comparator -> Replace current with the merge' (or cmd+3)

How to change shortcuts of the plugin

1. Download Coda Plugin Creator
2. Open the plugin 'Comparator' with 'Coda Plugin Creator'
3. Change the keys, for the shortcuts you want. Then 'Save' the new plugin.
4. Open the new plugin you just created with 'Coda'. When asked, choose 'overwrite the plugin'.

What's the default launch order for diff tools

Coda comparator plugin will launch the first diff tool it finds in this order :

1. your own script (if you have a symlink 'codacomparediff' in your /usr/local/bin)
2. File Merge from XCode
3. DiffMerge from SourceForge
4. Kaleidoscope CLI from BlackPixel
5. VimDiff in Terminal
6. Diff in Terminal
7. KDiff3 from Joachim Eibl
8. P4Merge from Perforce
9. Merge from Araxis
10. RoaringDiff from Biscade
11. Differencia from DaytimeSoftware
12. DeltaWalker from Deltopia
13. Guiffy from GuiffySoftware
14. DiffFork from DotFork
15. ECMerge from ElliéComputing
16. Changes from BitBQ
17. TextWrangler