Interactive Merging

Go forward to Merging with patch.
Go backward to diff3 Merging.
Go up to 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'.

Menu