|
Find |
Enters the Find Tool dialog to search for a string within the differences
view. The Find will search the 1st or 2nd text depending upon where the focus is.
Focus can be set by clicking in the text viewing area. The Status message at
bottom of Guiffy's window will indicate Found, Not Found, or Wrapped.
|
|
Find Next |
Searches for the next occurence of the Find string within the differences
view.
|
|
|
Next Change |
Scrolls the difference view (and merge view while merging) to the next difference.
|
|
Previous Change |
Scrolls the difference view (and merge view while merging) to the previous difference.
|
|
|
Next Attention |
While merging, Scrolls the views to the next Attention (unresolved change).
|
|
Current Attention |
While merging, Scrolls the views to the current Attention (unresolved change).
|
|
Previous Attention |
While merging, Scrolls the views to the previous Attention (unresolved change).
|
|
|
Keep/Undo All |
While merging, Use these tools to Keep or Undo all the changes.
|
|
[Keep All 1st] |
Keep all the change content from the 1st file and Remove all the change content
from the 2nd file.
|
|
[Keep All Both] |
Keep all the change content from the 1st file and Keep all the change content
from the 2nd file.
|
|
[Keep All 2nd] |
Keep all the change content from the 2nd file and Remove all the change content
from the 1st file.
|
|
[Undo All] |
Undo all the changes - resets each change to unresolved.
|
|
|
Merge AutoShifts[R] to Previous Attention |
While merging, Guiffy automatically advances to the next Attention. Shifting
into
[R]everse - automatically advances to the previous
Attention.
|
|
Merge does not AutoShift[N] |
While merging, Guiffy automatically advances to the next Attention.
Shifting
into
[N]eutral will keep the merge on the current Attention after doing a "Keep" --- so you
can do any editing needed.
|
|
Merge AutoShifts[D] to Next Attention |
While merging, Guiffy automatically advances to the next Attention.
Shifting
back into
[D]rive from Neutral (after resolving/editing an Attention) will
set
Auto Advancing back on and advance to the next Attention.
|
|
|
Scroll Bar & Meter |
The vertical scrollbar synchronizes scrolling split views (and merge view while merging). Scroll meters
next to the scroll bar visually show change block locations and their
relative size. The scroll meters are color coded - matching your style
choices. The scroll bar thumb's vertical position aligns with the scroll
meter indicating visually your position relative to change blocks. A
double-click in the scroll meter will scroll the views to the position
clicked on in the meter.
Synchronized vertical scrolling is also supported using your MouseWheel.
Synchronized horizontal scrolling is supported using an Apple Mouse on Macs and on other platforms
using your MouseWheel and the Shift key.
|