Kaleidoscope's ksdiff command-line tool lets you compare and merge any number of files from the Terminal. To install or remove, follow these instructions:
Kaleidoscope's ksdiff command-line tool lets you compare and merge any number of files from the Terminal. To install or remove, follow these instructions:
Kaleidoscope is supported by Versions 1.0.8 and later.
To integrate Kaleidoscope directly with the Subversion command-line integration, set it up as your default SVN diff or merge tool, or use it without making it the default. To make Kaleidoscope your default diff or merge tool, follow these steps:
To diff images from SVN, you need to add the --force parameter:
To use Kaleidoscope with Subversion without making it your default diff tool:
If an svn update command results in merge conflicts, it prompts you as to the action you wish to take. The l (lowercase l, for launch) option will launch Kaleidoscope to complete the merge.
To integrate Kaleidoscope directly with Git, set up Kaleidoscope as a Git diff and merge tool.
To make Kaleidoscope your default diff and merge tool, follow these steps:
To automatically configure Kaleidoscope as an optional diff and merge tool without making it the default:
'git difftool' takes the same arguments as 'git diff', see the man page for more information. To learn how Kaleidoscope's Git integration works, or for instructions on how to manually edit your .gitconfig to add Kaleidoscope integration, see the Git Integration topic in Kaleidoscope Help.
To integrate Kaleidoscope directly with Mercurial, you'll need the extdiff extension. This extension is included in Mercurial by default, but it will need to be activated. To set everything up, follow these instructions:
To integrate Kaleidoscope directly with Perforce, you can use the p4 command line tool. To set up the command line tool, follow these instructions:
To integrate Kaleidoscope directly with Perforce, you can use the P4V GUI application. To set up P4V, follow these instructions:
To integrate Kaleidoscope directly with Bazaar, set it up as your default diff and merge tool, or configure it without making it the default. To use it as an external merge tool, you'll need qbzr and Bazaar 2.4 or later. To make Kaleidoscope your default diff and merge tool, follow these steps:
To set up Kaleidoscope as a diff/merge tool without making it the default:
To use Kaleidoscope as TextMate's Subversion diff tool, follow these instructions:
Select a changed file in the file shelf. Press ⌃⇧A (control + shift + A) to pop up the Subversion Bundle commands. Select "Diff with Working Copy". Your changes should now be displayed in Kaleidoscope.
To use Kaleidoscope as TextMate's Mercurial diff tool, follow these instructions:
Select a changed file in the file shelf. Press ⌃⇧M (control + shift + M) to pop up the Mercurial Bundle commands. Select "Diff with Working Copy". Your changes should now be displayed in Kaleidoscope.