.\" -*- nroff -*-
.\"
.\" Copyright (c) 2004 Bob Willcox.
.\" All rights reserved.
.\"
.\" Redistribution and use in source and binary forms, with or without
.\" modification, are permitted provided that the following conditions
.\" are met:
.\" 1. Redistributions of source code must retain the above copyright
.\"    notice, this list of conditions and the following disclaimer.
.\" 2. Redistributions in binary form must reproduce the above copyright
.\"    notice, this list of conditions and the following disclaimer in the
.\"    documentation and/or other materials provided with the distribution.
.\"
.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND ANY
.\" EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
.\" WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
.\" DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY
.\" DEFECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
.\" (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
.\" LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
.\" ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
.\" Author:     Bob Willcox
.\"
.\" $Header: /usr/cvs/local/src/tkmerge/src/tkmerge.1,v 1.1 2004/12/17 16:29:11 bob Exp $
.\"
.Dd Dec 16, 2004
.Dt TKMERGE 1
.Sh NAME
.Nm tkmerge
.Nd Graphical Interface to Manually Merge Files
.Sh SYNOPSIS
.Nm
.Ar file1
.Ar file2
.Op Ar outfile
.Sh DESCRIPTION
.Nm
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
.Pq Ar file1 , Ar file2 ,
one for the merged result, and a fourth that
.Pq 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.
.Pp
If
.Ar outfile
is omitted, the merged output name will be derrived by appending
the string
.Dq .intg
to the
.Ar file1
path.
.Sh ENVIRONMENT
.Bl -tag -width EDITOR
.It Ev EDITOR
The path to the editor to be invoked when the
.Dq Editor
button is pressed.
The default is
.Xr vi 1 .
.Sh SEE ALSO
.Xr tkdiff 1
.Sh AUTHORS
.An Bob Willcox Aq bob@immure.com .