www.delorie.com/gnu/docs/diffutils/diff_58.html   search  
Buy GNU books!

Comparing and Merging Files

[ < ] [ > ]   [ << ] [ Up ] [ >> ]         [Top] [Contents] [Index] [ ? ]

9. Interactive Merging with sdiff

With sdiff, you can merge two files interactively based on a side-by-side `-y' format comparison (see section 2.4 Showing Differences Side by Side). Use `-o file' or `--output=file' to specify where to put the merged text. See section 16. 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 section `emerge' in The GNU Emacs Manual, for more information.

9.1 Specifying diff Options to sdiff  Summary of sdiff options.
9.2 Merge Commands  Merging two files interactively.

  webmaster   donations   bookstore     delorie software   privacy  
  Copyright 2003   by The Free Software Foundation     Updated Jun 2003