Info Catalog diffutils: diff3 Merging diffutils: Top diffutils: Merging with patch

diffutils: Interactive Merging

 
 9 Interactive Merging with 'sdiff'
 **********************************
 
 With 'sdiff', you can merge two files interactively based on a
 side-by-side '-y' format comparison (Side by Side).  Use
 '--output=FILE' ('-o FILE') to specify where to put the merged text.
 Invoking sdiff, for more details on the options to 'sdiff'.
 
    Another way to merge files interactively is to use the Emacs Lisp
 package 'emerge'.  Emerge (emacs)Emerge, for more information.
 

Menu

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

Info Catalog diffutils: diff3 Merging diffutils: Top diffutils: Merging with patch