Интерактивная система просмотра системных руководств (man-ов)
diff3 (1)
diff3 (1) ( Solaris man: Команды и прикладные программы пользовательского уровня )>> diff3 (1) ( FreeBSD man: Команды и прикладные программы пользовательского уровня ) diff3 (1) ( Linux man: Команды и прикладные программы пользовательского уровня )
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.
- --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 <[email protected]>.
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 diff
should give you access to the complete manual.
Index
- NAME
-
- SYNOPSIS
-
- DESCRIPTION
-
- AUTHOR
-
- REPORTING BUGS
-
- COPYRIGHT
-
- SEE ALSO
-
