Copyright: Copyright (c) 1994,1995 by Olga Golosovker


Combine versions

To combine two files you will first have to Find differences. The program will display all the differing segments side by side. For each of these sections you will have to select either left or right version by clicking left mouse button over the colored text. Selected segments will change their color to blue. After having resolved all the file differences you will be able to save or print the resulting version.


Contents

Contents for Visual Merge Help

Visual Merge is a tool you can use to compare and merge two files.

To learn how to use Help, press F1.

Introduction

What is Visual Merge?

How to Register?

What is new in this version(since version 1.2)?

How To...

Find differences

Combine versions

Commands

File menu commands

Search menu commands

Select menu commands

Options menu commands

Keyboard


File menu commands

•	         File 1 - for choosing the first file name

•	         File 2 - for choosing the second file name

•	         Diff   - displays files differences

•	         Write  - writes the results

•	         Print  - prints the combined version

•	         Quit   - just this.


Find differences

To calculate and display differences between two files you should perform following steps:

•	    Open files to be merged. The files will be displayed in file panes. If "Line Numbers" option is selected file lines will be enumerated.

•	    Select Diff from File menu or press Ctrl+D. The program will calculate the differences and color the differing sections of both files in 2 colors - green and yellow. Yellow lines are blank lines that have to be added to the file to match segment in the second file. Lines are colored green if the matching lines of second file either differ or are missing at all (in the last case lines of the second file are yellow).

After performing these steps you will be able to combine files and print or save the results


How to Register?

To become a registered user of VMERGE, please complete and return the following form along with the indicated license fee.  The license fee should be paid by check in U.S. dollars. Once you register for the program, you will be sent the the program either by e-mail or by regular mail, depending on your choice. In the latter case you should add postal fee as requested below. If you register for updates you will be sent the most recent version and notified of all the future releases of the program. You will be able to receive them by e-mail with no charge or by mail for postal fee only.

     Remit to:

     	 Olga and Victor Golosovker,

                    Havacelet 16/10,

                    Nesher,

                    Israel.

     ====================    ORDER     FORM   ==========================

        Name: ___________________________________________________

     Company: ___________________________________________________

     Address: ___________________________________________________

              ___________________________________________________

     Please accept this registration fee for VMERGE v1.26.

     Please send me (check the box) :

        [ ]  Diskette with the program by mail.

            [ ] Please, send me 3 1/2" diskette

            [ ] Please, send me 5 1/4" diskette

        [ ]  The program by e-mail (address attached).

              Internet E-mail: ___________________________________________

     ________________________________________     _______________

                     SIGNED                             DATE

     Registration fee - Choose one or more of the following options:

____  VMERGE v1.26 registration................................$ 20.00         [  ]

      (Does not include disk).

____  VMERGE v1.26 and future updates registration....$ 25.00         [  ]

____  VMERGE v1.26 site license.................................$ 120.00       [  ]

      (Does not include disk).

____  VMERGE v1.26 and future updates site license....$ 150.00        [  ]

____  Postage + media..................................................$  5.00           [  ]

                                                      TOTAL      $ _______


Keyboard

•	     Ctrl+F1 - load left file

•	     Ctrl+F2 - load right file

•	     Ctrl+D  - display files differences

•	     Ctrl+W  - write out the results.

•	     Ctrl+N  - Next differing section

•	     Ctrl+P  - Previous differing section

•	     Ctrl+F  - Font selection box

•	     Ctrl+T  - Tab size selection

•	     PgDown  - Next screen

•	     PgUp    - Previous screen

•	     Ctrl+PgDown  - Jump to the file end

•	     Ctrl+PgUp    - Jump to the file beginning


Options menu commands

•	         Compress spaces - instructs to consider a sequence of white spaces as a single space

•	         Line Numbers - displays line numbers along with text

•	         Tab size     - sets new tab size

•	         Font         - selects font

•	         Title Font   - selects title font


Search menu commands

•	        Next      - go to the next differing segment

•	         Previous  - go to the previous differing segment

•	         First     - go to the first differing segment

•	         Last      - go to the last differing segment

•	         Beginning - go to the first line

•	         End       - go to the last line


Select menu commands

•	         From Left    - chooses all the unresolved differences from the left file

•	         From Right   - unresolved segments are taken from the right file

•	         Unselect All - dismiss all the choices made so far


What is new in this version(since version 1.2)?

•	Adjustable tab size

•	Font selection

•	Title font selection

•	Options are saved in .ini file

•	Printout of the combined version

•	32 bit version without file size limit added

•	Closed bug that caused program to skip blocks in Previous/Next

•	improved algorithm

•	Jump to the beginning/end of file imlemented

•	 Jump to the first/last differing segment

•	Most of the memory and resource leaks closed


What is Visual Merge?

    VMERGE is an easy to use program designed to help people in merging files. Those who have tried once to combine two similar versions of a program know how difficult it is. There are always some lines which get forgotten or misplaced.

    There are some utilities for comparing files and producing list of differences between them, but these programs will often scarcely help, because one should still perform a merge manually, cutting lines alternately from both of the files. On the other hand, there are programs that can create a third file based on two version, but they are either too primitive or too complex for everyday use.

   VMERGE makes file merging much easier by letting you to choose between the differing portions by a single mouse click. Its intuitive interface and other features allow you to minimize manual postprocessing thus saving your time.

   Visual Merge is not a FreeWare.

   VMERGE  is ShareWare, copyright (c) 1994, 1995 by Olga Golosovker. Please, support the ShareWare concept and register your copy

   The author will be thankful for any comments, suggestions and bug reports.