BSD 4_3 release

[unix-history] / usr / man / man1 / diff3.1

diff --git a/usr/man/man1/diff3.1 b/usr/man/man1/diff3.1
index 50d6ef6..41638fe 100644 (file)
--- a/usr/man/man1/diff3.1
+++ b/usr/man/man1/diff3.1
@@ -1,10 +1,13 @@
-.TH DIFF3 1  "18 January 1983"
+.\"    @(#)diff3.1     6.2 (Berkeley) 8/20/85
+.\"
+.TH DIFF3 1 "August 20, 1985"
+.AT 3

 .SH NAME
 diff3 \- 3-way differential file comparison
 .SH SYNOPSIS
 .B diff3
 [
 .SH NAME
 diff3 \- 3-way differential file comparison
 .SH SYNOPSIS
 .B diff3
 [

-.B \-ex3
+.B \-exEX3

 ]
 file1 file2 file3
 .SH DESCRIPTION
 ]
 file1 file2 file3
 .SH DESCRIPTION


@@ -83,6 +86,48 @@ The following command will apply the resulting script to
 .PP
 .ti 16n
 (cat script; echo \'1,$p\') \(bv ed \- file1
 .PP
 .ti 16n
 (cat script; echo \'1,$p\') \(bv ed \- file1

+.PP
+The
+.B \-E
+and
+.B \-X
+are similar to
+.B \-e
+and
+.BR \-x ,
+respectively, but treat overlapping changes (i.e., changes that would
+be flagged with ==== in the normal listing) differently.  The overlapping
+lines from both files will be inserted by the edit script, bracketed
+by "<<<<<<" and ">>>>>>" lines.
+.PP
+For example, suppose lines 7-8 are changed in both file1 and file2.
+Applying the edit script generated by the command
+.ce
+"diff3 -E file1 file2 file3" 
+.br
+to file1 results in the file:
+.RS
+.nf
+
+lines 1-6
+of file1
+<<<<<<< file1
+lines 7-8
+of file1
+=======
+lines 7-8
+of file3
+>>>>>>> file3
+rest of file1
+.fi
+.RE
+.PP
+The
+.B \-E
+option is used by RCS
+.IR merge (1)
+to insure that overlapping changes in the merged files are preserved
+and brought to someone's attention.

 .SH FILES
 /tmp/d3?????
 .br
 .SH FILES
 /tmp/d3?????
 .br