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.
DIFFzilla
®
308
Содержание Corev3.3 for Eclipse
Страница 1: ...Think Slick Corev3 3 for Eclipse...
Страница 2: ......
Страница 3: ...SlickEdit Core v3 3 for Eclipse...
Страница 5: ......
Страница 6: ......
Страница 14: ...xii...
Страница 20: ...xviii...
Страница 22: ...xx...
Страница 23: ...Chapter 1 Introduction 1...
Страница 41: ...Chapter 3 User Interface 19...
Страница 61: ...Chapter 4 User Preferences 39...
Страница 80: ...BODY BODY HTML HTMLEOF Restoring Settings on Startup 58...
Страница 82: ...60...
Страница 83: ...Chapter 5 Context Tagging 61...
Страница 97: ...Chapter 6 Editing Features 75...
Страница 124: ...Code Templates 102...
Страница 187: ...The finished code is shown as follows Figure 6 24 Dynamic Surround Example 4 Dynamic Surround 165...
Страница 238: ...Figure 6 49 Test Parsing Configuration Example 1 C Refactoring 216...
Страница 240: ...Finally the following example shows a test resulting in no errors or warnings C Refactoring 218...
Страница 241: ...Figure 6 51 Test Parsing Configuration Example 3 Reviewing Refactoring Changes 219...
Страница 250: ...228...
Страница 251: ...Chapter 7 Language Specific Editing 229...
Страница 275: ...Java Refactoring See Java Refactoring for information about Java refactoring in SlickEdit Core Java Refactoring 253...
Страница 328: ...306...
Страница 329: ...Chapter 8 Tools and Utilities 307...
Страница 334: ...6 Click Save The Save Multi File Output dialog box opens Figure 8 3 Save Multi File Output Dialog DIFFzilla 312...
Страница 350: ...328...
Страница 351: ...Chapter 9 Macros and Macro Programming 329...
Страница 360: ...338...
Страница 361: ...Chapter 10 SlickEdit Core Dialogs 339...
Страница 375: ...Find and Replace View 353...
Страница 491: ...Chapter 11 Appendix 469...
Страница 567: ......
Страница 568: ......