Blame


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