From adc93f6097615f16d57e8a24a256302f2144ec4e Mon Sep 17 00:00:00 2001 From: rsc Date: Fri, 14 Jan 2005 17:37:50 +0000 Subject: cut out the html - they're going to cause diffing problems. --- man/man1/idiff.html | 87 ----------------------------------------------------- 1 file changed, 87 deletions(-) delete mode 100644 man/man1/idiff.html (limited to 'man/man1/idiff.html') diff --git a/man/man1/idiff.html b/man/man1/idiff.html deleted file mode 100644 index 15296a37..00000000 --- a/man/man1/idiff.html +++ /dev/null @@ -1,87 +0,0 @@ - -idiff(1) - Plan 9 from User Space - - - - -
-
-
IDIFF(1)IDIFF(1) -
-
-

NAME
- -
- - idiff – interactive diff
- -
-

SYNOPSIS
- -
- - idiff [ −bw ] file1 file2
- -
-

DESCRIPTION
- -
- - Idiff interactively merges file1 and file2 onto standard output. - Wherever file1 and file2 differ, idiff displays the differences - in the style of “diff −n” on standard error and prompts the user - to select a chunk. Valid responses are:
- <     Use the chunk from file1.
- >     Use the chunk from file2.
- =     Use the diff output itself.
- q<, q>, q=
- -
- - Use the given response for all future questions.
- -
- !cmdExecute cmd and prompt again. -
- - Idiff invokes diff(1) to compare the files. The −b and −w flags, - if passed, are passed to diff.
- -
-

FILES
- -
- - /tmp/idiff.*
- -
-

SOURCE
- -
- - /usr/local/plan9/src/cmd/idiff.c
- -
-

SEE ALSO
- -
- - diff(1)
- Kernighan and Pike, The Unix Programming Environment, Prentice-Hall, - 1984.
- -
- -

 -
-
- - -
-
-
-Space Glenda -
-
- - -- cgit v1.2.3