I want to use Beyond Compare 3 for file diffs in Veracity, so I tried using
What do I need to do to make this work? Can I permanently assign a custom diff tool?
To use Veracity with a custom diff (or merge) tool, you must first configure the tool in your settings. Then you can specify the tool by its configured name using --tool, and/or you can set it as the default tool to use in specified circumstances. An upcoming release will have built-in configuration settings for many common diff and merge tools, including Beyond Compare 3, but for now you'll have to do the configuration manually.
Here are the commands you'll need to run to configure Beyond Compare 3:
It should be reasonably obvious how you can adjust that for other diff tools, or for anyone reading this that has it installed at a different location, or so forth. The bcompare part of those commands is the arbitrary name that you'll use to specify the tool elsewhere, such as from the --tool flag. For example:
To set this as your default tool, use the following:
This sets bcompare as the default diff tool for the class of files called :text, which is generally what you want. This also leaves open the possibility of setting up other diff tools to be your default for other classes of files. The other built-in file class is :binary, but you can also configure your own.
To reset the default diff tool to the factory setting, use this command:
Configuring and using a merge tool is similar. Here are the merge settings for Beyond Compare 3:
Note that it's perfectly acceptable to have a diff tool and a merge tool with the same name (both bcompare in this case). Now you can use this tool during a resolve like so:
and you can set it as your default merge tool for resolve situations like so:
answered Nov 17 '11 at 10:31
Andy Tidball ♦