Compare Toolbar

This is where you'll find the operations that can be performed on the source and target files.

 

Figure 11.8. The Compare Toolbar

The Compare Toolbar

The available functions are presented at the Operations menu.

Perform files differencing

Run the diff algorithm selected in the Algorithm combo box on the two selected files.

Diff Options

Opens the Diff Options page.

Go to first modification

Scroll the two-way comparison panel to the first difference marked in the two-way comparison panel.

Go to previous modification

Scroll the two-way comparison panel to the previous difference marked in the two-way comparison panel.

Go to next modification

Scroll the two-way comparison panel and select the next difference marked in the two-way comparison panel.

Go to last modification

Scroll the two-way comparison panel and select the last difference marked in the two-way comparison panel.

Copy all non-conflicting changes from left to right

All the nodes present in the left side file and not present in the right side file are copied to the right side file.

Copy change from left to right

Copy the current difference marked in the two-way comparison panel from the left side file to the right side file.

Copy change from right to left

Copy the current difference marked in the two-way comparison panel from the right side file to the left side file.

Copy all non-conflicting changes from right to left

All the nodes present in the right side file and not present in the left side file are copied to the left side file.

Show modification details at word level

The Word algorithm is applied to the current difference marked in the two-way comparison panel and the result is displayed in a separate dialog.

Show modification details at char level

The Characters algorithm is applied to the current difference marked in the two-way comparison panel and the result is displayed in a separate dialog.

Enable scrolling synchronization

When one of the two panels is scrolled up or down the other panel is scrolled in the same direction so that corresponding match of the current difference from the other panel is displayed at the same time as in the scrolled panel.

Disable scrolling synchronization

When one of the two panels is scrolled up or down the other panel is not scrolled. The effect is that the corresponding match of the current difference from the other panel is not displayed at the same time as in the scrolled panel.

Also, <oXygen/> offers you the complete diff solution:

Diff Options button

It provides quick access to the Diff preferences pane where you set Diff parameters that will be saved for the next time when you open the Compare Files dialog.