VMERGE Version 1.2 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.2 is not a Public Domain and is not a freeware. VMERGE 1.2 is copyright (c) 1995 by Olga Golosovker. Users are granted without any charge the right to reproduce, distribute and use copies of VMERGE 1.2, subject to the following limitations, provided that all the supplied files should be hold intact. VMERGE 1.2 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 expressed 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.2 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 program, you will be sent the most current version of the program(request the disk if you need). If you register for the future updates you will be notified about all the future updates of the program which you might receive for postal fee only. Remit to: Olga Golosovker, Havacelet 16/10, Nesher, Israel. ==================== ORDER FORM ========================== Name: ___________________________________________________ Company: ___________________________________________________ Address: ___________________________________________________ ___________________________________________________ Please accept this registration fee for VMERGE v1.2. [ ] Please send me (check the box) : [ ] Disk with the program by mail. [ ] The program by e-mail (address attached). Internet E-mail: ___________________________________________ ________________________________________ _______________ SIGNED DATE Registration fee - Choose one or more of the following options: ____ VMERGE v1.2 registration.......................$ 15.00 $ _______ (Does not include disk). ____ VMERGE v1.2 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 (available only for registered users) Quit - just this. 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 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 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. The original file will be saved under the name .bak to prevent data loss. c) Keyboard shortcuts --------------------- 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 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 6. Known Bugs and Features -------------------------- * VMERGE is unable to handle files larger than 64k. 7. What is new in this version(relative to v1.03) -------------------------------------------------- * Improved white spaces compression mode * Does not use FC program 8. Next version(V1.21) features . --------------------------------- * Files larger than 64k. * Adjustable tab size 9. Address ---------- stdmail: Olga Golosovker, 16/10 Havacelet, Nesher, Israel, 36731 e-mail (Internet): olga@isg.co.il I will be thankful for any comments and bug reports.