.TH SUBMERGE "1" "February 12th, 2011" "submerge 2.0.0b5" "User commands"
.\" $Id: submerge.1 74 2011-02-12 10:16:44Z robert $
.SH NAME
submerge \- Graphical merge tool for text files.
.SH SYNOPSIS
\fBsubmerge\fR
.br
\fBsubmerge\fR \fBdiff\fR | \fBdiff2\fR [\fIoptions\fR] \fIoriginal\fR \fImodified\fR
.br
\fBsubmerge\fR \fBdiff3\fR | \fBmerge\fR [\fIoptions\fR] \fIoriginal\fR \fImodified\fR \fIlatest\fR \fImerged\fR
.br
\fBsubmerge\fR \fBhelp\fR [ \fBdiff\fR | \fBdiff2\fR | \fBdiff3\fR | \fBmerged\fR ]
.SH DESCRIPTION
.B submerge
is a graphical diff and merge tool for text files.
.SH COMMANDS
.TP 4
.BR diff " , "diff2
display differences of two files.
.TP
.BR diff3 " , " merge
visually merge differences of modifed and latest.
.TP
.BR help
display short help message.
.SH OPTIONS
.TP
\fB\-e\fR | \fB\-\-encoding\fR \fIarg\fR
encoding/codepage (iconv)
.TP
\fB\-L\fR | \fB\-\-label\fR \fIarg\fR
label for a given file (per file)
.TP
\fB\-\-w\fR+
whitespaces on
.TP
\fB\-\-w\-\fR
whitespaces off (ignore)
.SH SEE ALSO
.BR subcommander (1),
.BR svn (1),
`The Subcommander Guide' in /usr/share/doc/subcommander/html/index.html
(available in the subcommander-doc package),
http://subcommander.tigris.org/
.SH AUTHOR
Submerge was written by Martin Hauner <hauner@web.de>.
.PP
This manual page was written by Andreas Fester, <Andreas.Fester@gmx.de>,
for the Debian Project and may be used freely by others.
.br
The page was improved by Robert Luberda <robert@debian.org> with the help of
.BR help2man (1)
tool.