plied to the output file and the change IS indicated, so that using the
Next Conflict
button will show
you the change.
•
Output style
-
Output style
has no effect if there are no conflicts. The following output styles are avail-
able:
•
Interactive
- Provides a friendly side-by-side dialog box which lets you pick the change you want in
the output file. It also lets you edit.
•
Interleaved buffer
- Creates an editor buffer which you must edit to resolve conflicts.
•
Use smart merge
- If selected, the number of conflicts found is reduced.
•
Ignore spaces
- If selected, leading and trailing spaces are ignored. The side-by-side output allows
you to easily select the change that you want.
DIFFzilla
®
Dialog
The DIFFzilla dialog (
Tools
→
File Difference
) is used to configure a file differencing operation and begin
the diff. The options are categorized into two tabs:
•
DIFFzilla Files Tab
•
DIFFzilla Options Tab
DIFFzilla
®
Files Tab
You can compare two files or two source trees to determine which files have been added or removed and
to generate a list of file names. Use this tab to set up the comparison parameters for the files that you
wish to compare. After configuring your settings, click
OK
to start the diff.
Figure 10.19. DIFFzilla
®
: Files Tab
DIFFzilla
®
Dialog
372
Summary of Contents for Corev3.3 for Eclipse
Page 1: ...Think Slick Corev3 3 for Eclipse...
Page 2: ......
Page 3: ...SlickEdit Core v3 3 for Eclipse...
Page 5: ......
Page 6: ......
Page 14: ...xii...
Page 20: ...xviii...
Page 22: ...xx...
Page 23: ...Chapter 1 Introduction 1...
Page 41: ...Chapter 3 User Interface 19...
Page 61: ...Chapter 4 User Preferences 39...
Page 80: ...BODY BODY HTML HTMLEOF Restoring Settings on Startup 58...
Page 82: ...60...
Page 83: ...Chapter 5 Context Tagging 61...
Page 97: ...Chapter 6 Editing Features 75...
Page 124: ...Code Templates 102...
Page 238: ...Figure 6 49 Test Parsing Configuration Example 1 C Refactoring 216...
Page 241: ...Figure 6 51 Test Parsing Configuration Example 3 Reviewing Refactoring Changes 219...
Page 250: ...228...
Page 251: ...Chapter 7 Language Specific Editing 229...
Page 328: ...306...
Page 329: ...Chapter 8 Tools and Utilities 307...
Page 350: ...328...
Page 351: ...Chapter 9 Macros and Macro Programming 329...
Page 360: ...338...
Page 361: ...Chapter 10 SlickEdit Core Dialogs 339...
Page 375: ...Find and Replace View 353...
Page 491: ...Chapter 11 Appendix 469...
Page 567: ......
Page 568: ......