Slick V3.3 Comparing and Merging, Using the DIFFzilla Dialog, Dynamic Difference Editing

DIFFzilla®

Comparing and Merging

SlickEdit® Core provides two powerful ways to compare and merge files: DIFFzilla and 3-Way Merge.

DIFFzilla®

DIFFzilla provides powerful differencing capabilities that let you compare files or directories and view the differences side-by-side. You can make edits, merge changes, and save modified files easily within the results windows. As edits are made, the diff view is updated as you type, so you don't have to re-run the comparison. And, switching from a directory comparison to an individual file difference is as simple as a mouse click.

With DIFFzilla, you can:

•View differences between two files. See Comparing Two Files.

•View differences between symbols and parts of files. See Comparing Symbols or Parts of Files.

•View differences between all of the symbols in two files. See Comparing All Symbols of Two Files.

•View differences between source trees. See Comparing Two Directories.

•See intra-line differences, color-coded as you type. See Dynamic Difference Editing.

•Generate file lists. See Generating File Lists.

•Specify automatic directory mapping. See Automatic Directory Mapping.

•Save/restore multi-file results.

•Utilize dialog box history (wild cards, paths, file specifications).

Using the DIFFzilla® Dialog

The following sections describe how to use DIFFzilla and the differencing features in SlickEdit® Core. For more details on the specific options available on the DIFFzilla dialog (Tools → File Difference or diff command), see DIFFzilla Dialog.

Dynamic Difference Editing

DIFFzilla® allows you to diff, or compare, files, and provides the ability to view the differences side-by-side or interleaved (one on top of the other). The output is color-coded. The side-by-side output differences can be merged from one file to the other, and you can edit the files directly inside the DIFFzilla dia- log—this is called Dynamic Difference Editing.

Undo, copy/paste, Syntax Expansion/indenting, SmartPaste® , Auto List Members, Auto Parameter Info and many emulation key mappings work when editing in the DIFFzilla dialog box. When you type or make any edit, lines are re-diffed (compared again) so that you can view the new intra-line differences easily.

308