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
Содержание 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: ......