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

NAME

6       GNU 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       Mandatory  arguments  to  long  options are mandatory for short options
15       too.
16
17       -A, --show-all
18              output all changes, bracketing conflicts
19
20       -e, --ed
21              output ed script incorporating changes from OLDFILE to  YOURFILE
22              into MYFILE
23
24       -E, --show-overlap
25              like -e, but bracket conflicts
26
27       -3, --easy-only
28              like -e, but incorporate only nonoverlapping changes
29
30       -x, --overlap-only
31              like -e, but incorporate only overlapping changes
32
33       -X     like -x, but bracket conflicts
34
35       -i     append 'w' and 'q' commands to ed scripts
36
37       -m, --merge
38              output  actual  merged file, according to -A if no other options
39              are given
40
41       -a, --text
42              treat all files as text
43
44       --strip-trailing-cr
45              strip trailing carriage return on input
46
47       -T, --initial-tab
48              make tabs line up by prepending a tab
49
50       --diff-program=PROGRAM
51              use PROGRAM to compare files
52
53       -L, --label=LABEL
54              use LABEL instead of file name (can  be  repeated  up  to  three
55              times)
56
57       --help display this help and exit
58
59       -v, --version
60              output version information and exit
61
62       The  default  output format is a somewhat human-readable representation
63       of the changes.
64
65       The -e, -E, -x, -X (and corresponding long) options cause an ed  script
66       to be output instead of the default.
67
68       Finally,  the  -m  (--merge) option causes diff3 to do the merge inter‐
69       nally and output the actual merged file.  For unusual  input,  this  is
70       more robust than using ed.
71
72       If a FILE is '-', read standard input.  Exit status is 0 if successful,
73       1 if conflicts, 2 if trouble.
74

AUTHOR

76       Written by Randy Smith.
77

REPORTING BUGS

79       Report bugs to: bug-diffutils@gnu.org
80       GNU diffutils home page: <https://www.gnu.org/software/diffutils/>
81       General help using GNU software: <https://www.gnu.org/gethelp/>
82

84       Copyright © 2018 Free Software Foundation, Inc.   License  GPLv3+:  GNU
85       GPL version 3 or later <https://gnu.org/licenses/gpl.html>.
86       This  is  free  software:  you  are free to change and redistribute it.
87       There is NO WARRANTY, to the extent permitted by law.
88

SEE ALSO

90       cmp(1), diff(1), sdiff(1)
91
92       The full documentation for GNU is maintained as a Texinfo  manual.   If
93       the info and GNU programs are properly installed at your site, the com‐
94       mand
95
96              info GNU
97
98       should give you access to the complete manual.
99
100
101
102diffutils 3.7                    December 2018                          GNU(1)
Impressum