Penguin
Recent Changes
Annotated edit history of merge(1) version 2, including all changes. View license author blame.
Rev Author # Line
1 perry 1 MERGE
2 !!!MERGE
3 NAME
4 SYNOPSIS
5 DESCRIPTION
6 OPTIONS
7 DIAGNOSTICS
8 IDENTIFICATION
9 SEE ALSO
10 BUGS
11 ----
12 !!NAME
13
14
15 merge - three-way file merge
16 !!SYNOPSIS
17
18
19 __merge__ [[ ''options'' ] ''file1 file2
20 file3''
21 !!DESCRIPTION
22
23
24 __merge__ incorporates all changes that lead from
25 ''file2'' to ''file3'' into ''file1''. The result
26 ordinarily goes into ''file1''. __merge__ is useful
27 for combining separate changes to an original. Suppose
28 ''file2'' is the original, and both ''file1'' and
29 ''file3'' are modifications of ''file2''. Then
30 __merge__ combines both changes.
31
32
33 A conflict occurs if both ''file1'' and ''file3'' have
34 changes in a common segment of lines. If a conflict is
35 found, __merge__ normally outputs a warning and brackets
36 the conflict with ____ and
37 ____ lines. A typical
38 conflict will look like this:
39
40
41 ____ ''file A
42 lines in file A
43 ''__=======
44 __''lines in file B
45 ''____ ''file B
46 ''
47
48
49 If there are conflicts, the user should edit the result and
50 delete one of the alternatives.
51 !!OPTIONS
52
53
54 __-A__
55
56
57 Output conflicts using the __-A__ style of
2 perry 58 diff3(1), if supported by __diff3__. This merges
1 perry 59 all changes leading from ''file2'' to ''file3'' into
60 ''file1'', and generates the most verbose
61 output.
62
63
64 __-E__, __-e__
65
66
67 These options specify conflict styles that generate less
2 perry 68 information than __-A__. See diff3(1) for details.
1 perry 69 The default is __-E__. With __-e__, __merge__ does
70 not warn about conflicts.
71
72
73 __-L__ ''label''
74
75
76 This option may be given up to three times, and specifies
77 labels to be used in place of the corresponding file names
78 in conflict reports. That is, __merge -L x -L y -L z a b
79 c__ generates output that looks like it came from files
80 __x__, __y__ and __z__ instead of from files
81 __a__, __b__ and __c__.
82
83
84 __-p__
85
86
87 Send results to standard output instead of overwriting
88 ''file1''.
89
90
91 __-q__
92
93
94 Quiet; do not warn about conflicts. __-V__ Print 's
95 version number.
96 !!DIAGNOSTICS
97
98
99 Exit status is 0 for no conflicts, 1 for some conflicts, 2
100 for trouble.
101 !!IDENTIFICATION
102
103
104 Author: Walter F. Tichy.
105 Manual Page Revision: 5.7; Release Date: 1995/06/01.
106 Copyright 1982, 1988, 1989 Walter F. Tichy.
107 Copyright 1990, 1991, 1992, 1993, 1994, 1995 Paul
108 Eggert.
109 !!SEE ALSO
110
111
112 diff3(1), diff(1), rcsmerge(1), co(1).
113 !!BUGS
114
115
116 It normally does not make sense to merge binary files as if
117 they were text, but __merge__ tries to do it
118 anyway.
119 ----
This page is a man page (or other imported legacy content). We are unable to automatically determine the license status of this page.