GSP
Quick Navigator

Search Site

Unix VPS
A - Starter
B - Basic
C - Preferred
D - Commercial
MPS - Dedicated
Previous VPSs
* Sign Up! *

Support
Contact Us
Online Help
Handbooks
Domain Status
Man Pages

FAQ
Virtual Servers
Pricing
Billing
Technical

Network
Facilities
Connectivity
Topology Map

Miscellaneous
Server Agreement
Year 2038
Credits
 

USA Flag

 

 

Man Pages


Manual Reference Pages  -  DIFF3 (1)

NAME

diff3 - compare three files line by line

CONTENTS

Synopsis
Description
Author
Copyright

SYNOPSIS

diff3 [OPTION]... MYFILE OLDFILE YOURFILE

DESCRIPTION

Compare three files line by line.
-e --ed Output unmerged changes from OLDFILE to YOURFILE into MYFILE.
-E --show-overlap
  Output unmerged changes, bracketing conflicts.
-A --show-all
  Output all changes, bracketing conflicts.
-x --overlap-only
  Output overlapping changes.
-X Output overlapping changes, bracketing them.
-3 --easy-only
  Output unmerged nonoverlapping changes.
-m --merge
  Output merged file instead of ed script (default -A).
-L LABEL --label=LABEL
  Use LABEL instead of file name.
-i Append ‘w’ and ‘q’ commands to ed scripts.
-a --text Treat all files as text.
--strip-trailing-cr
  Strip trailing carriage return on input.
-T --initial-tab
  Make tabs line up by prepending a tab.
--diff-program=PROGRAM
  Use PROGRAM to compare files.
-v --version
  Output version info.
--help Output this help.
If a FILE is ‘-’, read standard input. Exit status is 0 if successful, 1 if conflicts, 2 if trouble.

AUTHOR

Written by Randy Smith.

REPORTING BUGS

Report bugs to <bug-gnu-utils@gnu.org>.

COPYRIGHT

Copyright © 2004 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

SEE ALSO

The full documentation for diff3 is maintained as a Texinfo manual. If the info and diff3 programs are properly installed at your site, the command
info diff3
should give you access to the complete manual.
Search for    or go to Top of page |  Section 1 |  Main Index


diffutils 2.8.7 DIFF3 (1) April 2004

Powered by GSP Visit the GSP FreeBSD Man Page Interface.
Output converted with manServer 1.07.