sdiff, you can merge two files interactively based on a
side-by-side `-y' format comparison (see section Showing Differences Side by Side). Use
`-o file' or `--output=file' to specify where to
put the merged text. See section Invoking
sdiff, for more details on the
Another way to merge files interactively is to use the Emacs Lisp
emerge. See section `emerge' in The GNU Emacs Manual, for more information.
sdiff options have the same meaning as for
diff. See section Options to
diff, for the use of these options.
-a -b -d -i -t -v -B -H -I regexp --ignore-blank-lines --ignore-case --ignore-matching-lines=regexp --ignore-space-change --left-column --minimal --speed-large-files --suppress-common-lines --expand-tabs --text --version --width=columns
For historical reasons,
sdiff has alternate names for some
options. The `-l' option is equivalent to the `--left-column'
option, and similarly `-s' is equivalent to
`--suppress-common-lines'. The meaning of the
`-w' and `-W' options is interchanged from that of
sdiff, `-w columns' is equivalent to
`--width=columns', and `-W' is equivalent to
sdiff without the `-o' option is
diff with the `-y' or `--side-by-side'
option (see section Showing Differences Side by Side).
Groups of common lines, with a blank gutter, are copied from the first
file to the output. After each group of differing lines,
prompts with `%' and pauses, waiting for one of the following
commands. Follow each command with RET.
The text editor invoked is specified by the
variable if it is set. The default is system-dependent.