1 .TH IDIFF 1
2 .SH NAME
3 idiff \- 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
13 interactively
14 merges 
15 .I file1
16 and 
17 .IR file2 .
18 Wherever
19 .I file1
20 and
21 .I file2
22 differ,
23 .I idiff
24 displays the differences in the style of
25 .RB `` diff
26 .RB -n ''
27 and prompts the user to select a chunk.
28 Valid responses are:
29 .TP
30 .B <
31 Use the chunk from 
32 .IR file1 .
33 .TP
34 .B >
35 Use the chunk from
36 .IR file2 .
37 .TP
38 .B =
39 Use the diff output itself.
40 .TP
41 .BR q< ", " q> ", " q=
42 Use the given response for all future questions.
43 .TP
44 .BI ! cmd
45 Execute
46 .I cmd
47 and prompt again.
48 .PP
49 .I Idiff
50 invokes
51 .IR diff (1)
52 to compare the files.
53 The
54 .B -b
55 and
56 .B -w
57 flags
58 are simply
59 passed through to
60 .IR diff .
61 .SH FILES
62 .B /tmp/idiff.*
63 .SH SOURCE
64 .B /usr/local/plan9/src/cmd/idiff.c
65 .SH "SEE ALSO
66 .IR diff (1)
67 .br
68 Kernighan and Pike,
69 .IR "The Unix Programming Environment" ,
70 Prentice-Hall, 1984.
71 .SH BUGS
72 This is a poorly-written manual page.