Configuring the Diff Viewer
See Also
You can change the default Diff settings in the Options window.
You can modify how the Textual Diff Viewer and the Graphical Diff Viewer display results when comparing file revisions using the diff command.
You can also modify the display properties of the Graphical Merge Conflicts Resolver.
To configure the diff viewer, choose Tools > Options and then click the Advanced Options button in the Options window.
In the left pane of the Options window, expand IDE Configuration > Server and External Tool Settings > Diff and Merge Types.
You can modify the Diff Viewer and Merge Visualizer properties using the following nodes in the left pane.
- Diff Engines. Enables you to specify diff command options.
Expand the Diff Engines node to set properties to configure the following:
- Command-line Diff. Click the ellipsis button (...) to specify any diff command options (for example, diff -b) to be used when running the diff command from a command-line executable in the IDE.
Diff options are not availabe when using the built-in diff engine.
- Before you can use the command-line diff engine on a Microsoft Windows system, you must have a command-line diff executable (for example, from a Cygwin distribution) installed on your system.
For the UNIX� environment, there is a diff executable installed and available to you by default.
- Built-in Diff Engine. No properties are available.
- Diff Visualizers. Enables you to set properties for the Diff viewers, which display the results when comparing file revisions using the Diff command in the IDE.
Expand the Diff Visualizers node to set properties to configure the following:
- Textual Diff Viewer. You can enable or disable Context Mode and specify the number of lines of context to display.
If Context Mode is selected, the specified number of lines of context are displayed around differences in the textual diff.
- Graphical Diff Viewer. You can modify the default background highlight colors for changed text in the graphical diff viewer.
Click the ellipsis button (...) to specify the color.
- Diff Services. Enables you to enable or disable the service selector.
Expand the Diff Services node to set properties to configure the following:
- Built-in Diff Service. You can enable or disable the diff service selector.
If Show Diff Service Selector is selected, the drop-down list to select a diff viewer is visible in the toolbar of the diff results window.
The service selector enables you to switch between the diff viewers.
- Merge Visualizers. Enables you to set the display properties for the Graphical Merge Conflicts Resolver.
Expand the Merge Visualizers node to set properties to configure the following:
- Graphical Merge Conflicts Resolver. You can modify the default background highlight colors for changed text in the Graphical Merge Conflicts Resolver.
Click the ellipsis (...) button to specify the color.
- See Also
- Comparing File Revisions in CVS
- Resolving Merge Conflicts
- Comparing Two Files in the IDE
- Using the Options Window
Legal Notices