aboutsummaryrefslogtreecommitdiff
path: root/man/man1/diff.1
diff options
context:
space:
mode:
authorrsc <devnull@localhost>2005-01-26 07:10:02 +0000
committerrsc <devnull@localhost>2005-01-26 07:10:02 +0000
commit4ac5f249ad40f3452fc87dc9a3f4b9d9546c83b0 (patch)
tree6c07ca323274f6bda70ee10dea4299c765ba4e62 /man/man1/diff.1
parent57d2613621107f7ee9d9e717c3c2903b1caf4bbe (diff)
downloadplan9port-4ac5f249ad40f3452fc87dc9a3f4b9d9546c83b0.tar.gz
plan9port-4ac5f249ad40f3452fc87dc9a3f4b9d9546c83b0.tar.bz2
plan9port-4ac5f249ad40f3452fc87dc9a3f4b9d9546c83b0.zip
add -c option
Diffstat (limited to 'man/man1/diff.1')
-rw-r--r--man/man1/diff.17
1 files changed, 6 insertions, 1 deletions
diff --git a/man/man1/diff.1 b/man/man1/diff.1
index 237fc57b..dbb598ef 100644
--- a/man/man1/diff.1
+++ b/man/man1/diff.1
@@ -4,7 +4,7 @@ diff \- differential file comparator
.SH SYNOPSIS
.B diff
[
-.B -efmnbwr
+.B -cefmnbwr
] file1 ... file2
.SH DESCRIPTION
.I Diff
@@ -123,6 +123,11 @@ not useful with
in the opposite order. It may, however, be
useful as input to a stream-oriented post-processor.
.PP
+The
+.B -c
+option includes three lines of context around each
+change, merging changes whose contexts overlap.
+.PP
Except in rare circumstances,
.I diff
finds a smallest sufficient set of file