GNU Info

Info Node: (diff.info)Interactive Merging

(diff.info)Interactive Merging


Next: Merging with patch Prev: diff3 Merging Up: Top
Enter node , (file) or (file)node

Interactive Merging with `sdiff'
********************************

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

   Another way to merge files interactively is to use the Emacs Lisp
package `emerge'.  Note: emerge, for more information.

sdiff Option Summary
Summary of `sdiff' options.
Merge Commands
Merging two files interactively.

automatically generated by info2www version 1.2.2.9