Index: stable/10/contrib/diff/man/diff3.1
===================================================================
--- stable/10/contrib/diff/man/diff3.1	(revision 260497)
+++ stable/10/contrib/diff/man/diff3.1	(revision 260498)
@@ -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/10
===================================================================
--- stable/10	(revision 260497)
+++ stable/10	(revision 260498)

Property changes on: stable/10
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r260358