Free Knowledge Resources


Linux Manual Pages


Free Software * Books

Source Code

Free Media

Linux

diff3(1)


NAME

   diff3 - compare three files line by line

SYNOPSIS

   diff3 [OPTION]... MYFILE OLDFILE YOURFILE

DESCRIPTION

   Compare three files line by line.

   Mandatory  arguments  to  long  options are mandatory for short options
   too.

   -A, --show-all
          output all changes, bracketing conflicts

   -e, --ed
          output ed script incorporating changes from OLDFILE to  YOURFILE
          into MYFILE

   -E, --show-overlap
          like -e, but bracket conflicts

   -3, --easy-only
          like -e, but incorporate only nonoverlapping changes

   -x, --overlap-only
          like -e, but incorporate only overlapping changes

   -X     like -x, but bracket conflicts

   -i     append 'w' and 'q' commands to ed scripts

   -m, --merge
          output  actual  merged file, according to -A if no other options
          are given

   -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

   -L, --label=LABEL
          use LABEL instead of file name (can  be  repeated  up  to  three
          times)

   --help display this help and exit

   -v, --version
          output version information and exit

   The  default  output format is a somewhat human-readable representation
   of the changes.

   The -e, -E, -x, -X (and corresponding long) options cause an ed  script
   to be output instead of the default.

   Finally,  the  -m  (--merge)  option  causes  diff3  to  do  the  merge
   internally and output the actual merged file.  For unusual input,  this
   is more robust than using ed.

   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-diffutils@gnu.org
   GNU diffutils home page: <http://www.gnu.org/software/diffutils/>
   General help using GNU software: <http://www.gnu.org/gethelp/>

COPYRIGHT

   Copyright  2016 Free Software Foundation, Inc.   License  GPLv3+:  GNU
   GPL version 3 or later <http://gnu.org/licenses/gpl.html>.
   This  is  free  software:  you  are free to change and redistribute it.
   There is NO WARRANTY, to the extent permitted by law.

SEE ALSO

   cmp(1), diff(1), sdiff(1)

   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.



Opportunity


Personal Opportunity - Free software gives you access to billions of dollars of software at no cost. Use this software for your business, personal use or to develop a profitable skill. Access to source code provides access to a level of capabilities/information that companies protect though copyrights. Open source is a core component of the Internet and it is available to you. Leverage the billions of dollars in resources and capabilities to build a career, establish a business or change the world. The potential is endless for those who understand the opportunity.

Business Opportunity - Goldman Sachs, IBM and countless large corporations are leveraging open source to reduce costs, develop products and increase their bottom lines. Learn what these companies know about open source and how open source can give you the advantage.



Free Software


Free Software provides computer programs and capabilities at no cost but more importantly, it provides the freedom to run, edit, contribute to, and share the software. The importance of free software is a matter of access, not price. Software at no cost is a benefit but ownership rights to the software and source code is far more significant.

Free Office Software - The Libre Office suite provides top desktop productivity tools for free. This includes, a word processor, spreadsheet, presentation engine, drawing and flowcharting, database and math applications. Libre Office is available for Linux or Windows.



Free Books


The Free Books Library is a collection of thousands of the most popular public domain books in an online readable format. The collection includes great classical literature and more recent works where the U.S. copyright has expired. These books are yours to read and use without restrictions.

Source Code - Want to change a program or know how it works? Open Source provides the source code for its programs so that anyone can use, modify or learn how to write those programs themselves. Visit the GNU source code repositories to download the source.



Education


Study at Harvard, Stanford or MIT - Open edX provides free online courses from Harvard, MIT, Columbia, UC Berkeley and other top Universities. Hundreds of courses for almost all major subjects and course levels. Open edx also offers some paid courses and selected certifications.

Linux Manual Pages - A man or manual page is a form of software documentation found on Linux/Unix operating systems. Topics covered include computer programs (including library and system calls), formal standards and conventions, and even abstract concepts.


birds banner