Node:Interactive Merging, Next:Merging with patch, Previous:diff3 Merging, Up:Top

Interactive Merging with sdiff

With sdiff, you can merge two files interactively based on a side-by-side -y format comparison (see Side by Side). Use -o file or --output=file to specify where to put the merged text. See Invoking sdiff, for more details on the options to sdiff.

Another way to merge files interactively is to use the Emacs Lisp package emerge. See emerge, for more information.

• sdiff Option Summary: Summary of sdiff options.
• Merge Commands: Merging two files interactively.