submerge (1)

submerge

submerge diff | diff2 [options] original modified

submerge diff3 | merge [options] original modified latest merged

submerge help [ diff | diff2 | diff3 | merged ]

submerge is a graphical diff and merge tool for text files.

diff , diff2

display differences of two files.

diff3 , merge

visually merge differences of modifed and latest.

help

display short help message.

-e | --encoding arg

encoding/codepage (iconv)

-L | --label arg

label for a given file (per file)

--w+

whitespaces on

--w-

whitespaces off (ignore)

subcommander(1), svn(1), `The Subcommander Guide' in /usr/share/doc/subcommander/html/index.html (available in the subcommander-doc package), http://subcommander.tigris.org/

Submerge was written by Martin Hauner <[email protected]>.

This manual page was written by Andreas Fester, <[email protected]>, for the Debian Project and may be used freely by others.

The page was improved by Robert Luberda <[email protected]> with the help of help2man(1) tool.