To Compare Files choose File -> Open&Compare Files. This enters the File Open Dialog for the 1st File and then the 2nd File and then performs the Compare.
To Compare Folders choose File -> Open&Compare Folders. This enters the Folder Open Dialog for the 1st Folder and then the 2nd Folder and then performs the Compare.
To Compare Trees - Folders and SubFolders(Recursively), select the Show Options "Show SubFolders (Recursively)".
To Save the Compare Text choose File -> Save JIFference. This enters the File Save Dialog and allows you to choose a name for the saved file. The saved file contains the "Together" view text. File Compares or Folder Compares can be Saved this way.
To Print the Compare Text choose File -> Print JIFference. This enters the Print Dialog. The printed file contains the "Together" view text. File Compares or Folder Compares can be Printed this way. Compare differences are printed in bold.
To Save the Compare as a RCS Difference choose File -> Save as RCS Difference. This enters the File Save Dialog and allows you to name the saved file. The saved file is a RCS Differnce expression for the compare - useful for updating a RCS or CVS version.
To Save the Compare as HTML choose File -> Save JIFference as HTML. This enters the File Save Dialog and allows you to choose a name for the saved files. Actually a set of files including sub-folders is generated and saved - the saved file name specified is used as a prefix. The saved files can be viewed with any browser. The browser view provides the user a choice of the 3 Guiffy views: Together, Side-by-Side, or Split Horizontally. The browser view will appear very much like Guiffy's view - with color and font styles specified according to the settings when the Save as HTML is performed. File Compares or Folder Compares can be Saved this way.
First, Compare two files.
Then, to Merge the Files choose File -> Merge Files. This enters Merge mode - A third window (the merge view) will appear above the compare view with a row of buttons below it for interactively choosing the merge content. Merge mode will position the Merge and Compare views at each change. Choose the merge content by pressing one of the 3 selection buttons. After choosing the merge content for each change, Save the Merged File(File ->Save Merge File).
OR, After comparing the two files, use Guiffy's SmartMerge to choose all the merge contents except the changes which conflict with each other. Choose File ->SmartMerge(3-Way). A File Open Dialog will appear to specify the parent file of the two files being merged. Guiffy will enter merge mode, automatically choose the merge content for all the changes except those that require your attention, and then enter the interactive merge mode for your resolution of those changes.
The Merge View can be edited at any time. Make a minor change, insert or delete a line... You can even perform, Edit ->Copy, Cut, Paste, and Undo operations!
See also: