Index: stable/9/contrib/diff/man/diff3.1
===================================================================
--- stable/9/contrib/diff/man/diff3.1	(revision 260498)
+++ stable/9/contrib/diff/man/diff3.1	(revision 260499)
@@ -1,78 +1,78 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.33.
 .TH DIFF3 "1" "April 2004" "diffutils 2.8.7" "User Commands"
 .SH NAME
 diff3 \- compare three files line by line
 .SH SYNOPSIS
 .B diff3
 [\fIOPTION\fR]... \fIMYFILE OLDFILE YOURFILE\fR
 .SH DESCRIPTION
 Compare three files line by line.
 .TP
 \fB\-e\fR  \fB\-\-ed\fR
 Output unmerged changes from OLDFILE to YOURFILE into MYFILE.
 .TP
 \fB\-E\fR  \fB\-\-show\-overlap\fR
 Output unmerged changes, bracketing conflicts.
 .TP
 \fB\-A\fR  \fB\-\-show\-all\fR
 Output all changes, bracketing conflicts.
 .TP
 \fB\-x\fR  \fB\-\-overlap\-only\fR
 Output overlapping changes.
 .TP
 \fB\-X\fR
 Output overlapping changes, bracketing them.
 .TP
 \fB\-3\fR  \fB\-\-easy\-only\fR
 Output unmerged nonoverlapping changes.
 .TP
 \fB\-m\fR  \fB\-\-merge\fR
 Output merged file instead of ed script (default \fB\-A\fR).
 .TP
 \fB\-L\fR LABEL  \fB\-\-label\fR=\fILABEL\fR
 Use LABEL instead of file name.
 .TP
 \fB\-i\fR
 Append `w' and `q' commands to ed scripts.
 .TP
 \fB\-a\fR  \fB\-\-text\fR
 Treat all files as text.
 .TP
 \fB\-\-strip\-trailing\-cr\fR
 Strip trailing carriage return on input.
 .TP
 \fB\-T\fR  \fB\-\-initial\-tab\fR
 Make tabs line up by prepending a tab.
 .TP
 \fB\-\-diff\-program\fR=\fIPROGRAM\fR
 Use PROGRAM to compare files.
 .TP
 \fB\-v\fR  \fB\-\-version\fR
 Output version info.
 .TP
 \fB\-\-help\fR
 Output this help.
 .PP
 If a FILE is `-', read standard input.
 Exit status is 0 if successful, 1 if conflicts, 2 if trouble.
 .SH AUTHOR
 Written by Randy Smith.
 .SH "REPORTING BUGS"
 Report bugs to <bug-gnu-utils@gnu.org>.
 .SH COPYRIGHT
 Copyright \(co 2004 Free Software Foundation, Inc.
 .br
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 .SH "SEE ALSO"
 The full documentation for
 .B diff3
 is maintained as a Texinfo manual.  If the
 .B info
 and
 .B diff3
 programs are properly installed at your site, the command
 .IP
-.B info diff
+.B info diff3
 .PP
 should give you access to the complete manual.
Index: stable/9/contrib/diff
===================================================================
--- stable/9/contrib/diff	(revision 260498)
+++ stable/9/contrib/diff	(revision 260499)

Property changes on: stable/9/contrib/diff
___________________________________________________________________
Added: svn:mergeinfo
## -0,0 +0,5 ##
   Merged /projects/largeSMP/contrib/diff:r221273-222812,222815-223757
   Merged /projects/head_mfi/contrib/diff:r233621
   Merged /vendor/resolver/dist/contrib/diff:r1540-186085
   Merged /projects/quota64/contrib/diff:r184125-207707
   Merged /head/contrib/diff:r226343,226347-226349,226353,226388,226702,226785,227006,227518,227524,227526,228191,228193,228199,228475,228487,228761,229067,229809,229997,230127,230587,231544,232274,233713,234313,234449,234690,234782,235122,235638,235879,235939,236338-236339,236346-236347,236365,236592-236594,236620-236623,236637,236959,236977,237005-237006,237011,237279,237350,237357,237574,237625,237794,238051,238896-238897,238933,239347-239348,240295-240296,240336,241002,241972,241974,242137-242138,242202,242998,243147,243798,243800,244039,244058,244673,245952,246256,247285,248370,248388,248690,248706,248708,248752,248983,249526,249563,249600,249658,249701,249807,249893,250423,250487,250550,250566,250574,250812,250823,251212,251368,251382,251480,251561-251562,251612,252348,252363,252397,253325,253725-253726,253814,254941,255048,255107,256448,257029,258017,258081,258115,258138,258143,258157,258179,258204-258207,258311,258321,258429,258501,258507,258530,258573,258651,258683,258712,258731,258748,258817,258826,258904,258943,259005,259022,259092,259108,259197,259525,259529,259555,259558,259649,259655,259666,259696,259780,259841,259873,259944,260358