 |
Opens 1st and 2nd folders and then performs the compare.
|
 |
Opens 1st and 2nd files and then performs the compare.
|
 |
Begins an interactive Merge process, opens the merge view for the current compare
files.
|
 |
Begins a SureMerge process, enters File Open Dialog for parent file, smartly
merges all changes which don't conflict and then opens the merge view for the current compare
files to allow interactive resolution of any conflicting changes.
|
 |
Saves the contents of the current merged view to the file specified.
|
 |
Prints the Compare Report in color (by launching your browser
to preview the HTML Compare Report).
|
 |
Enters the Ignore control dialog for choosing to ignore case, or
whitespace differences, or field(s)(in columns A-B and X-Y), or
blank lines inserted or deleted, or
lines matching Regular Expressions during compares and/or merges.
|
 |
Enters the Show control dialog for choosing Tab Size, display of entire
files(default) or only differences or differences within a context,
and displaying line numbers(default) during compares.
|
 |
Enters the Compare/Merge Bifocal "Shades" dialog for selecting which
type of compare alogrithm to apply for file compares and 2-way merges. Plus,
the Attention Focus Expander allows you to expand the attention(conflict) area
for 3-way SureMerges.
|
 |
Enters the Folder Compare Ignore Options dialog for selecting
Ignore these SubFolders, Ignore these Files, Ignore these FileTypes, Ignore Modified Date and Time, Ignore File Size, and
Verify files Match(Byte-by-Byte or with Text compare) during Folder Compares.
|
 |
Enters the Folder Compare Show Options dialog for selecting Show SubFolders
(Recursively), Show Matching files, Show files Added, Show files Deleted, and
Show files changed.
|
 |
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.
|
 |
Scrolls the difference view (and merge view while merging) to the previous difference.
|
 |
Scrolls the difference view (and merge view while merging) to the next difference.
|
 |
While merging, Scrolls the views to the previous Attention(unresolved change).
|
 |
While merging, Scrolls the views to the next Attention(unresolved change).
|
 |
While merging, Guiffy automatically advances to the next Attention. Clicking the AutoShift
into [N]eutral will keep the merge on the current Attention after doing a "Keep" --- so you
can do any editing needed. Then, click the AutoShifter back into [D] to set
Auto Advancing back on and advance to the next Attention.
Ctrl-Click
shifts the Auto Advancing into [R]everse - automatically advancing to the previous
Attention.
|
 |
Scrolls the difference view (and merge view while merging) to the difference chosen
from its choice list.
|
 |
While merging the choice list #prefix indicates changes not merged yet while the
~prefix shows changes already merged.
|