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 c8b6342d 2005-01-13 devnull .I file2
18 c8b6342d 2005-01-13 devnull onto standard output.
19 cfa37a7b 2004-04-10 devnull Wherever
20 cfa37a7b 2004-04-10 devnull .I file1
21 cfa37a7b 2004-04-10 devnull and
22 cfa37a7b 2004-04-10 devnull .I file2
23 cfa37a7b 2004-04-10 devnull differ,
24 cfa37a7b 2004-04-10 devnull .I idiff
25 cfa37a7b 2004-04-10 devnull displays the differences in the style of
26 cfa37a7b 2004-04-10 devnull .RB `` diff
27 c8b6342d 2005-01-13 devnull .BR -n ''
28 c8b6342d 2005-01-13 devnull on standard error
29 cfa37a7b 2004-04-10 devnull and prompts the user to select a chunk.
30 cfa37a7b 2004-04-10 devnull Valid responses are:
31 cfa37a7b 2004-04-10 devnull .TP
32 cfa37a7b 2004-04-10 devnull .B <
33 cfa37a7b 2004-04-10 devnull Use the chunk from
34 cfa37a7b 2004-04-10 devnull .IR file1 .
35 cfa37a7b 2004-04-10 devnull .TP
36 cfa37a7b 2004-04-10 devnull .B >
37 cfa37a7b 2004-04-10 devnull Use the chunk from
38 cfa37a7b 2004-04-10 devnull .IR file2 .
39 cfa37a7b 2004-04-10 devnull .TP
40 cfa37a7b 2004-04-10 devnull .B =
41 cfa37a7b 2004-04-10 devnull Use the diff output itself.
42 cfa37a7b 2004-04-10 devnull .TP
43 cfa37a7b 2004-04-10 devnull .BR q< ", " q> ", " q=
44 cfa37a7b 2004-04-10 devnull Use the given response for all future questions.
45 cfa37a7b 2004-04-10 devnull .TP
46 cfa37a7b 2004-04-10 devnull .BI ! cmd
47 cfa37a7b 2004-04-10 devnull Execute
48 cfa37a7b 2004-04-10 devnull .I cmd
49 cfa37a7b 2004-04-10 devnull and prompt again.
50 cfa37a7b 2004-04-10 devnull .PP
51 cfa37a7b 2004-04-10 devnull .I Idiff
52 cfa37a7b 2004-04-10 devnull invokes
53 d32deab1 2020-08-16 rsc .MR diff (1)
54 cfa37a7b 2004-04-10 devnull to compare the files.
55 cfa37a7b 2004-04-10 devnull The
56 cfa37a7b 2004-04-10 devnull .B -b
57 cfa37a7b 2004-04-10 devnull and
58 cfa37a7b 2004-04-10 devnull .B -w
59 c8b6342d 2005-01-13 devnull flags,
60 c8b6342d 2005-01-13 devnull if passed,
61 c8b6342d 2005-01-13 devnull are
62 c8b6342d 2005-01-13 devnull passed to
63 cfa37a7b 2004-04-10 devnull .IR diff .
64 cfa37a7b 2004-04-10 devnull .SH FILES
65 cfa37a7b 2004-04-10 devnull .B /tmp/idiff.*
66 cfa37a7b 2004-04-10 devnull .SH SOURCE
67 c3674de4 2005-01-11 devnull .B \*9/src/cmd/idiff.c
68 cfa37a7b 2004-04-10 devnull .SH "SEE ALSO
69 d32deab1 2020-08-16 rsc .MR diff (1)
70 cfa37a7b 2004-04-10 devnull .br
71 cfa37a7b 2004-04-10 devnull Kernighan and Pike,
72 cfa37a7b 2004-04-10 devnull .IR "The Unix Programming Environment" ,
73 cfa37a7b 2004-04-10 devnull Prentice-Hall, 1984.