| Option
|
Description
|
Default
|
| Synchronize
scrolling between panes in compare viewers
|
The two comparison viewers will "lock scroll" along
with one another in order to keep identical and corresponding portions
of the code in each pane side-by-side. Turn this option off if you
do not want the compare viewers to lock scroll.
|
On
|
| Initially show ancestor pane |
Sometimes you want to compare two versions
of a resource with the previous version from which they were both derived.
This is called their common ancestor, and it appears in its own
comparison pane during a three way compare. Turn this option on if you
want the ancestor pane to always appear at the start of a comparison. |
Off |
| Show pseudo conflicts |
Displays pseudo conflicts, which occur
when two developers make the same change (for example, both add or remove
the exact same line of code or comment). Turn this option on if you want
pseudo conflicts to appear in compare browsers. |
Off |
| Connect ranges with single
line |
Controls whether differing ranges are visually
connected by a single line or a range delimited by two lines. |
On |
| Highlight individual changes |
Controls whether the individual changes inside
conflicts are highlighted. |
On |
| When the end/beginning is
reached while navigating an element |
Use this option to configure what occurs when
the end/beginning is reached while navigating an element.
-
Prompt: If this option is on and you selected
to compare a single element you will be asked whether you want to go
to the beginning/end of the element after the end/beginning is reached.
If you are comparing two or more elements you will be asked whether
you want to go to the beginning/end of the current element or to go
to the next/previous element. Moreover, if you choose to remember your
decision, this option will be changed to one of the below respectively.
-
Loop back to the beginning/end: When this option
is on, the selection will me moved back to the beginning/end after you reach
the end/beginning of an element.
-
Go to the next/previous element: If you are comparing
two or more elements and this option is on after you reach the end/beginning
of an element the next/previous element will be opened.
|
Prompt |
