

                               VMERGE 

                             Version 1.0

                      Visual Diff / Merge Program



           1. Overview
           -----------

        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 knows how difficult it is. There are always some lines 
     which get forgotten or misplaced.  

        There are some command-line utilities, able of 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 the files.

        VMERGE will make merge much easier by letting you to choose
     between the differing portions in a single mouse click. 

        VMERGE is only a visual shell. It does not contain a file-
     comparing engine and uses FC program ( which comes with MS-DOS ). 
     But its interface is quite natural and have proved to be effective 
     in merges. I hope it will help you too.
       


        2. Software license
        -------------------

        VMERGE 1.0 is not a Public Domain and is not a freeware.
     VMERGE 1.0 is copyright (c) 1994 by Olga Cherkasov.
     Users are granted without any charge the right to reproduce, 
     distribute and use copies of VMERGE 1.0, subject to the following
     limitations:
         a) No fee is charged for its use
         b) All the accompanying files should be hold intact
         c) Non-registered users may use VMERGE 1.0 for 30 days.
            After that they will have to register.
     VMERGE 1.0 or any of the accompanying files may not be modified in
     any respect, including disassembling or patching, without explicit
     permission of the author.

        The author hereby disclaims all  warranties  relating to this
     software, whether express or implied, including without
     limitation any implied warranties of merchantability or fitness
     for a  particular  purpose.  The author will not be liable for
     any special, incidental, consequential, indirect or similar
     damages due to loss of data or any other reason. This includes,
     but is not limited to, computer hardware, computer software,
     operating systems, and any computer or computing accessories.
     The person using the software bears all risk as to the quality
     and performance of the software.

        The author is in no way obligated to support for VMERGE, or
     to provide    future versions of VMERGE 1.0 unless the user
     registers for them (see registration information).



        3. Registration information
        ---------------------------


     To become a registered user of VMERGE, complete and return this
     form along with the indicated license fee.  The license fee
     should be paid by check in U.S. dollars. Once you register for
     the future updates of the program, you will be sent the most
     current version of the program (request the disk if you need).
     Also you will be notified about all the future updates of the
     program which you may receive for postal fee only.

     Remit to:        Olga Cherkasova,
                    Havacelet 16/10,
                    Nesher,
                    Israel.


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


        Name: ___________________________________________________

     Company: ___________________________________________________

     Address: ___________________________________________________

              ___________________________________________________


     Please accept this registration fee for VMERGE v1.0.

     [ ] Please send me (check the box) :

        [ ]  Disk with the program by mail.
        [ ]  The program by e-mail (address attached).
              E-mail: ___________________________________________


     ________________________________________     _______________
                     SIGNED                             DATE


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


____  VMERGE v1.0 registration.......................$ 15.00     $ _______
      (Does not include disk).

____  VMERGE v1.0 and future updates registration....$ 20.00     $ _______
      (Does not include disk).

____  Add $2 if you require the 3 1/2" disk                      $ _______


____  Postage, prepaid...............................$  3.00     $ _______


                                                      TOTAL      $ _______



        4. Using VMERGE
        ----------------

             a) General
             -----------

        VMERGE main window contain two file panes and menu. There are 3
     items in the menu:    File, Options and About. File opens a submenu
     with the following items:
         File 1 - for choosing the first file name
         File 2 - for choosing the second file name
         Diff   - display files differences
         Write  - write the results
         Quit   - just it
     Options opens a submenu with 2 items:
         Line Numbers - display line numbers along with text
         Compress spaces - consider a sequence of white spaces as a single
                          space
     About opens "About" dialog box.

        There is also a quick menu available in the file panes. It's opened
     by pressing the right mouse button. The menu contains following items:
         Next - go to the next differing segment
         Previous  - go to the previous differing segment
         Pick Left - chooses all the unresolved differences from the left file
         Pick Right - the same from the left file
         Unselect All - dismiss all the choices made so far
     
     
             b) Merging files
             ----------------
     
     1) Open files to be merged. The files will be displayed in file panes.
        If "Line Numbers" option was selected then the lines will be 
        enumerated.

     2) Select Diff from File menu. The message "Running FC" will appear
        and screen will blank for a couple of seconds. Now press "OK"
        in the dialog box. The program will color the differing sections
        of both files in 2 colors - green and yellow. Yellow lines are 
        blank lines that should 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 this case
        lines of the second file are yellow colored). 

     3) For each of the differing segments you should select one of the
        files by clicking left mouse button over the colored text. 
        Selected segments will become blue. 
        
     4) Select "Write" from the File menu and choose the output file name.
        The results will be written to the file. 
        NOTE : If the file already exists it will be overridden. 


             c) Keyboard shortcuts
             ---------------------
             
         Ctrl+F1 - load left file
         Ctrl+F2 - load right file
         Ctrl+D  - display files differences
         Ctrl+W  - write out the results.     
     
     
             d) Warning messages
             -------------------

     1) "Files are too different" - files differ too much. The program will
        probably miss some of the differences, but most of them will still
        be displayed.

     2) "You have unresolved differences" - there are differing segments 
        where none of the files was selected.



         5. Requirements
         ---------------

     1) 80286 Processor

     2) Windows 3.xx

     3) FC file compare utility should be locatable by VMERGE ( that is
        present in the path or in the VMERGE starting directory ).

        

         6. Known Bugs and Features
         --------------------------

     1) VMERGE is unable to handle files larger than 64k.

     2) Sometimes FC utility produces erroneous output. It may cause
        to display differences in wrong lines( usually the mistake is
        a 1-2 lines ).

     3) The screen blanks when VMERGE internally calls FC.



         7. Next version(V1.1) features
         ------------------------------

     *  Built-in file differences search. FC no more. 
     
     *  No screen blanking. 
     
     *  Better differences matching algorithm.

     *  Fewer errors.

     *  Saving back-up when overriding file 



           8. Address
         ----------

      stdmail:

        Olga Cherkasova,
        16/10 Havacelet,
        Nesher,
        Israel

     e-mail (Internet):

        olga@isg.co.il


     I will be thankful for any comments and bug reports.
