|
|
1.1 root 1: .TH IDIFF 1
2: .CT 1 files dirs
3: .SH NAME
4: idiff \(mi interactive file comparison
5: .SH SYNOPSIS
6: .B idiff
7: [
8: .I option
9: ]
10: .I file1 file2
11: .SH DESCRIPTION
12: .I Idiff
13: compares
14: .I file1
15: with
16: .I file2
17: using
18: .IR diff ,
19: then presents each set of changed lines
20: for selection or processing.
21: .I File2
22: may be a directory;
23: in that case, the basename of
24: .I file1
25: is appended.
26: .PP
27: For each group, legal responses are
28: .TP
29: .B <
30: to retain the `from' lines
31: .TP
32: .B >
33: to retain the `to' lines
34: .TP
35: .B e
36: to edit both sets of lines
37: .TP
38: .B d
39: to delete both sets
40: .TP
41: .B 1
42: to retain the rest of the `from' file
43: .TP
44: .B 2
45: to retain the rest of the `to' file
46: .TP
47: .B !
48: to invoke a shell command
49: .PP
50: Lines that compare equal are copied verbatim from
51: .I file1.
52: Lines produced by this process,
53: including the lines written from within the editor,
54: are written to file
55: .IR idiff.out .
56: Comparison may be affected by the
57: .IR diff (1)
58: options
59: .TP
60: .B -b
61: Ignore trailing blanks (spaces and tabs) and treat other
62: strings of blanks as if they were a single space.
63: .TP
64: .B -B
65: Ignore all blanks.
66: .SH FILES
67: .TF /tmp/idiff.*
68: .TP
69: .F idiff.out
70: .TP
71: .F idiff.*
72: .TP
73: .F /tmp/idiff.*
74: .SH SEE ALSO
75: .IR diff (1)
76: .SH BUGS
77: There is no way to revisit a choice.
This archive runs on limited infrastructure. Preserving old code on modern bandwidth. Automated agents are requested to crawl responsibly.