DragonFly On-Line Manual Pages

TKMERGE(1)             DragonFly General Commands Manual            TKMERGE(1)

NAME
     tkmerge - Graphical Interface to Manually Merge Files

SYNOPSIS
     tkmerge file1 file2 [outfile]

DESCRIPTION
     tkmerge is a tk script to help with the task of merging the differences
     between two files.  On startup creates a window consisting of four
     panels. One for each of the source files (file1, file2), one for the
     merged result, and a fourth that (optionally) contains editable
     substitution text and various selection and navigation buttons and
     options.  Additionally, for any of the difference sequences you may elect
     to edit them with your favorite editor via the "Editor" button.  When
     done you will be prompted to save the merged result file prior to
     exiting.

     If outfile is omitted, the merged output name will be derrived by
     appending the string ".intg" to the file1 path.

ENVIRONMENT
     EDITOR  The path to the editor to be invoked when the "Editor" button is
             pressed.  The default is vi(1).

SEE ALSO
     tkdiff(1)

AUTHORS
     Bob Willcox <bob@immure.com>.

                               December 16, 2004