(diff.info) Interactive Merging

情報カタログ

(diff.info) diff3 Merging

(diff.info) Top

(diff.info) Merging with patch

 
 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 `-o
 FILE' or `--output=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.
 

メニュー

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

情報カタログ

(diff.info) diff3 Merging

(diff.info) Top

(diff.info) Merging with patch