Understanding the Comparison
If you compare two files (file1.txt and file2.txt), the compare editor shows the contents of file1.txt on the
left and file2.txt on the right. The lines connecting the left and right panes indicate the differences between
the files.
You can double click on the editor tab to maximize the editor.
- Lines that differ between the two files are highlighted in color. The bands connecting the left and right
panes indicate which lines correspond to each other.
- White lines are identical in both files.
- Gray lines exist in one file but not the other, or have different contents. Parts of a changed line may also
be highlighted individually. You can turn this option off on the
General > Compare/Patch
preference page.
Hint: On the right-hand side of the comparison, to the right of the scrollbar, there is a column which
shows a graphical representation of all differences between the resources. You can click on any of the segments
displayed there to quickly scroll to that difference.
Three way comparisons
Local history
Comparing resources
Synchronizing with the repository
Merging changes in the Compare editor
Resolving conflicts
Setting preferences for comparing files
Comparing resources with repository versions
Tiling editors
Compare editor
Compare/Patch preferences