diff3 man page on aLinux

Man page or keyword search:  
man Server   7435 pages
apropos Keyword Search (all sections)
Output format
aLinux logo
[printable version]

DIFF3(1)			 User Commands			      DIFF3(1)

NAME
       diff3 - compare three files line by line

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.

       -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.

AUTHOR
       Written by Randy Smith.

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

COPYRIGHT
       Copyright © 2002 Free Software Foundation, Inc.

       This  program  comes  with NO WARRANTY, to the extent permitted by law.
       You may redistribute copies of this program under the terms of the  GNU
       General	Public License.	 For more information about these matters, see
       the file named COPYING.

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 diff

       should give you access to the complete manual.

diffutils 2.8.1			  April 2002			      DIFF3(1)
[top]

List of man pages available for aLinux

Copyright (c) for man pages and the logo by the respective OS vendor.

For those who want to learn more, the polarhome community provides shell access and support.

[legal] [privacy] [GNU] [policy] [cookies] [netiquette] [sponsors] [FAQ]
Tweet
Polarhome, production since 1999.
Member of Polarhome portal.
Based on Fawad Halim's script.
...................................................................
Vote for polarhome
Free Shell Accounts :: the biggest list on the net