Home
Main website
Display Sidebar
Hide Ads
Recent Changes
View Source:
diff3(1)
Edit
PageHistory
Diff
Info
LikePages
DIFF3 !!!DIFF3 NAME SYNOPSIS DESCRIPTION SEE ALSO DIAGNOSTICS ---- !!NAME diff3 - find differences between three files !!SYNOPSIS __diff3__ [[options] mine older yours !!DESCRIPTION The ''diff3'' command compares three files and outputs descriptions of their differences. The files to compare are ''mine'', ''older'', and ''yours''. At most one of these three file names may be __-__, which tells ''diff3'' to read the standard input for that file. __Options__ Below is a summary of all of the options that GNU ''diff3'' accepts. Multiple single letter options (unless they take an argument) can be combined into a single command line argument. __-a__ Treat all files as text and compare them line-by-line, even if they do not appear to be text. __-A__ Incorporate all changes from ''older'' to ''yours'' into ''mine'', surrounding all conflicts with bracket lines. __-B__ Old behavior of -A. Shows non-conflicts. __-e__ Generate an ''ed'' script that incorporates all the changes from ''older'' to ''yours'' into ''mine''. __-E__ Like __-e__, except bracket lines from overlapping changes' first and third files. With __-e__, an overlapping change looks like this: mine ''lines from ''mine ''======= lines from ''yours ''''yours '' __--ed__ Generate an ''ed'' script that incorporates all the changes from ''older'' to ''yours'' into ''mine''. __--easy-only__ Like __-e__, except output only the nonoverlapping changes. __-i__ Generate __w__ and __q__ commands at the end of the ''ed'' script for System V compatibility. This option must be combined with one of the __-AeExX3__ options, and may not be combined with __-m__. __--initial-tab__ Output a tab rather than two spaces before the text of a line in normal format. This causes the alignment of tabs in the line to look normal. __-L__ ''label'' __--label=__''label'' Use the label ''label'' for the brackets output by the __-A__, __-E__ and __-X__ options. This option may be given up to three times, one for each input file. The default labels are the names of the input files. Thus __diff3 -L X -L Y -L Z -m A B C__ acts like __diff3 -m A B C ,__ except that the output looks like it came from files named __X__, __Y__ and __Z__ rather than from files named __A__, __B__ and __C__. __-m__ __--merge__ Apply the edit script to the first file and send the result to standard output. Unlike piping the output from ''diff3'' to ''ed'', this works even for binary files and incomplete lines. __-A__ is assumed if no edit script option is specified. __--overlap-only__ Like __-e__, except output only the overlapping changes. __--show-all__ Incorporate all unmerged changes from ''older'' to ''yours'' into ''mine'', surrounding all overlapping changes with bracket lines. __--show-overlap__ Like __-e__, except bracket lines from overlapping changes' first and third files. __-T__ Output a tab rather than two spaces before the text of a line in normal format. This causes the alignment of tabs in the line to look normal. __--text__ Treat all files as text and compare them line-by-line, even if they do not appear to be text. __-v__ __--version__ Output the version number of ''diff3''. __-x__ Like __-e__, except output only the overlapping changes. __-X__ Like __-E__, except output only the overlapping changes. In other words, like __-x__, except bracket changes as in __-E__. __-3__ Like __-e__, except output only the nonoverlapping changes. !!SEE ALSO cmp(1), comm(1), diff(1), ed(1), patch(1), sdiff(1). !!DIAGNOSTICS An exit status of 0 means ''diff3'' was successful, 1 means some conflicts were found, and 2 means trouble. ----
7 pages link to
diff3(1)
:
merge(1)
rcsmerge(1)
Man1d
cmp(1)
diff(1)
sdiff(1)
CVS
This page is a man page (or other imported legacy content). We are unable to automatically determine the license status of this page.