Google Git
Sign in
plan9port / plan9 / 608a09284ecf721781b2145ea62cce82f4f44712 / . / man / man1 / idiff.1
blob: e8d37615ddbe86ae14bdb0f5b5b22d0cfdad0631 [file] [log] [blame]
rsccfa37a72004-04-10 18:53:55 +0000[diff] [blame]1.TH IDIFF 1
2.SH NAME
3idiff \- interactive diff
4.SH SYNOPSIS
5.B idiff
6[
7.B -bw
8]
9.I file1
10.I file2
11.SH DESCRIPTION
12.I Idiff
13interactively
14merges
15.I file1
16and
rscc8b63422005-01-13 04:49:19 +0000[diff] [blame]17.I file2
18onto standard output.
rsccfa37a72004-04-10 18:53:55 +0000[diff] [blame]19Wherever
20.I file1
21and
22.I file2
23differ,
24.I idiff
25displays the differences in the style of
26.RB `` diff
rscc8b63422005-01-13 04:49:19 +0000[diff] [blame]27.BR -n ''
28on standard error
rsccfa37a72004-04-10 18:53:55 +0000[diff] [blame]29and prompts the user to select a chunk.
30Valid responses are:
31.TP
32.B <
33Use the chunk from
34.IR file1 .
35.TP
36.B >
37Use the chunk from
38.IR file2 .
39.TP
40.B =
41Use the diff output itself.
42.TP
43.BR q< ", " q> ", " q=
44Use the given response for all future questions.
45.TP
46.BI ! cmd
47Execute
48.I cmd
49and prompt again.
50.PP
51.I Idiff
52invokes
53.IR diff (1)
54to compare the files.
55The
56.B -b
57and
58.B -w
rscc8b63422005-01-13 04:49:19 +0000[diff] [blame]59flags,
60if passed,
61are
62passed to
rsccfa37a72004-04-10 18:53:55 +0000[diff] [blame]63.IR diff .
64.SH FILES
65.B /tmp/idiff.*
66.SH SOURCE
rscc3674de2005-01-11 17:37:33 +0000[diff] [blame]67.B \*9/src/cmd/idiff.c
rsccfa37a72004-04-10 18:53:55 +0000[diff] [blame]68.SH "SEE ALSO
69.IR diff (1)
70.br
71Kernighan and Pike,
72.IR "The Unix Programming Environment" ,
73Prentice-Hall, 1984.