forked from s390guy/vm370
-
Notifications
You must be signed in to change notification settings - Fork 0
/
DIFF3.HELPCMD.D1
63 lines (44 loc) · 1.54 KB
/
DIFF3.HELPCMD.D1
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
GNU diff3
Compare three files line by line. Port of GNU diff3 command.
+----------------------------------------------------------------------------+
| DIFF3 | [options] fileid1 fileid2 fileid3 |
+----------------------------------------------------------------------------+
where:
fileid1, filed2, fileid3
must be entered on the command line using "." to separate the
components, for example.
profile.exec.a
Options:
Mandatory arguments to long options are mandatory for short options
too.
-A, --show-all
output all changes, bracketing conflicts
-e, --ed
output ed script incorporating changes from OLDFILE to YOURFILE
into MYFILE
-E, --show-overlap
like -e, but bracket conflicts
-3, --easy-only
like -e, but incorporate only nonoverlapping changes
-x, --overlap-only
like -e, but incorporate only overlapping changes
-X like -x, but bracket conflicts
-i append 'w' and 'q' commands to ed scripts
-m, --merge
output actual merged file, according to -A if no other options
are given
-a, --text
treat all files as text
--strip-trailing-cr
strip trailing carriage return on input
-T, --initial-tab
make tabs line up by prepending a tab
--diff-program=PROGRAM
use PROGRAM to compare files
-L, --label=LABEL
use LABEL instead of file name (can be repeated up to three
times)
--help
display this help and exit
-v, --version
output version information and exit