- publishing free software manuals
Comparing and Merging Files with GNU diff and patch
by David MacKenzie, Paul Eggert, and Richard Stallman
Paperback (6"x9"), 120 pages
ISBN 0954161750
RRP £12.95 ($19.95)

"Well packaged... the quality of information is excellent" --- Linux User and Developer Magazine (Issue 36, Feb 2004) Get a printed copy>>>

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.

ISBN 0954161750Comparing and Merging Files with GNU diff and patchSee the print edition