2. In the
Filename
text box, enter the baseline (original) file name. Click the
Ellipses
button to the right of
the text box to select files. Click the
B
button to select from the open buffers.
3. Enter the other names of the files to be merged in the
Revision 1
and
2
text boxes.
4. In the
Output file Filename
text box, enter the name of the output file, or click the
Ellipses
button to
select from an existing file.
5. Select any
Merge style
or
Output style
that you want.
6. Click
OK
. The following dialog box is displayed with the results of the 3-Way Merge:
Figure 8.5. 3-Way Merge Results Dialog
3-Way Merge
315
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: ......