1DIFF3(1)                         User Commands                        DIFF3(1)
2
3
4

NAME

6       diff3 - compare three files line by line
7

SYNOPSIS

9       diff3 [OPTION]... MYFILE OLDFILE YOURFILE
10

DESCRIPTION

12       Compare three files line by line.
13
14       -e  --ed
15              Output unmerged changes from OLDFILE to YOURFILE into MYFILE.
16
17       -E  --show-overlap
18              Output unmerged changes, bracketing conflicts.
19
20       -A  --show-all
21              Output all changes, bracketing conflicts.
22
23       -x  --overlap-only
24              Output overlapping changes.
25
26       -X     Output overlapping changes, bracketing them.
27
28       -3  --easy-only
29              Output unmerged nonoverlapping changes.
30
31       -m  --merge
32              Output merged file instead of ed script (default -A).
33
34       -L LABEL  --label=LABEL
35              Use LABEL instead of file name.
36
37       -i     Append `w' and `q' commands to ed scripts.
38
39       -a  --text
40              Treat all files as text.
41
42       -T  --initial-tab
43              Make tabs line up by prepending a tab.
44
45       --diff-program=PROGRAM
46              Use PROGRAM to compare files.
47
48       -v  --version
49              Output version info.
50
51       --help Output this help.
52
53       If a FILE is `-', read standard input.
54

AUTHOR

56       Written by Randy Smith.
57

REPORTING BUGS

59       Report bugs to <bug-gnu-utils@gnu.org>.
60

62       Copyright © 2002 Free Software Foundation, Inc.
63
64       This  program  comes  with NO WARRANTY, to the extent permitted by law.
65       You may redistribute copies of this program under the terms of the  GNU
66       General  Public License.  For more information about these matters, see
67       the file named COPYING.
68

SEE ALSO

70       The full documentation for diff3 is maintained as a Texinfo manual.  If
71       the  info  and  diff3 programs are properly installed at your site, the
72       command
73
74              info diff
75
76       should give you access to the complete manual.
77
78
79
80diffutils 2.8.1                   April 2002                          DIFF3(1)
Impressum