sdiff
sdiff
sdiff -o outfile [options] from to
Find differences between the two files from and to and merge interactively, writing the results to outfile.
Options
Treat remaining options as filenames, even if they begin with -.
Treat all files as text and compare line by line.
Ignore differences in whitespace.
Ignore added or missing blank lines.
Use a different algorithm to find fewer changes. This option causes sdiff to run more slowly.
Heuristically speed comparison of large files with many small scattered changes.
Ignore case changes.
Ignore any changes that insert or delete lines matching the regular expression regexp.
Ignore whitespace when comparing lines.
Print only the left column of common lines.
Write merged output to the specified file.
Suppress common lines.
Convert tabs to spaces in the output to preserve alignment.
Print version information and exit.
Set the output to cols columns wide.
Ignore horizontal whitespace when comparing lines.
Interactive commands
Edit, then use both versions, with a header for each.
Edit, then use both versions.
Edit, then use the left version.
Edit, then use the right version.
Edit a new version to replace the others.
Display a list of these commands.
Use the left version.
Use the right version.
Silently include common lines.
Verbosely include common lines.
Quit.