submerge1
Graphical merge tool for text files.
Usage
submerge
submerge {diff | diff2
[options]
original
modified}
submerge {diff3 | merge
[options]
original
modified
latest
merged}
submerge help
[{diff | diff2 | diff3 | merged}]
Overview
submerge is a graphical diff and merge tool for text files.
Commands
|
display differences of two files. |
|---|---|
|
visually merge differences of modifed and latest. |
|
display short help message. |
Options
-
-e | --encoding arg -
encoding/codepage (iconv)
-
-L | --label arg -
label for a given file (per file)
-
--w+ -
whitespaces on
-
--w- -
whitespaces off (ignore)
Releases
6 releases since Debian 4.0 (Etch); the text changed 2 times.
--encoding since Debian 6.0 (Squeeze);
--label since Debian 6.0 (Squeeze);
--w+ since Debian 6.0 (Squeeze);
--w- since Debian 6.0 (Squeeze);
-L since Debian 6.0 (Squeeze);
-e since Debian 6.0 (Squeeze).