|
0
|
1 |
'\" t
|
|
|
2 |
.\"
|
|
|
3 |
.\" CDDL HEADER START
|
|
|
4 |
.\"
|
|
|
5 |
.\" The contents of this file are subject to the terms of the
|
|
|
6 |
.\" Common Development and Distribution License (the "License").
|
|
|
7 |
.\" You may not use this file except in compliance with the License.
|
|
|
8 |
.\"
|
|
|
9 |
.\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
|
|
|
10 |
.\" or http://www.opensolaris.org/os/licensing.
|
|
|
11 |
.\" See the License for the specific language governing permissions
|
|
|
12 |
.\" and limitations under the License.
|
|
|
13 |
.\"
|
|
|
14 |
.\" When distributing Covered Code, include this CDDL HEADER in each
|
|
|
15 |
.\" file and include the License file at usr/src/OPENSOLARIS.LICENSE.
|
|
|
16 |
.\" If applicable, add the following below this CDDL HEADER, with the
|
|
|
17 |
.\" fields enclosed by brackets "[]" replaced with your own identifying
|
|
|
18 |
.\" information: Portions Copyright [yyyy] [name of copyright owner]
|
|
|
19 |
.\"
|
|
|
20 |
.\" CDDL HEADER END
|
|
|
21 |
.\"
|
|
11
|
22 |
.\" Copyright 2010 Sun Microsystems, Inc. All rights reserved.
|
|
0
|
23 |
.\" Use is subject to license terms.
|
|
|
24 |
.\"
|
|
11
|
25 |
.\" ident "@(#)meld.1 1.2 10/03/16 SMI"
|
|
0
|
26 |
.\"
|
|
|
27 |
.TH meld 1 "26 Jul 2008" "SunOS 5.11" "User Commands"
|
|
|
28 |
.SH NAME
|
|
|
29 |
meld \- graphical diff and merge tool
|
|
|
30 |
.SH SYNOPSIS
|
|
|
31 |
.LP
|
|
|
32 |
.nf
|
|
|
33 |
\fBmeld\fR [\fB--version\fR] [\fB-h\fR] [\fB--help\fR]
|
|
|
34 |
\fBmeld\fR [\fB-ceru\fR] \fIdir\fR
|
|
|
35 |
\fBmeld\fR [\fB-ceru\fR] \fIfile\fR
|
|
|
36 |
\fBmeld\fR [\fB-ceru\fR] \fIdir\fR \fIdir\fR [\fIdir\fR]
|
|
|
37 |
\fBmeld\fR [\fB-ceru\fR] [\fB-L LABEL,...\fR] [\fB--label=LABEL,...\fR] \fIfile\fR \fIfile\fR [\fIfile\fR]
|
|
|
38 |
.fi
|
|
|
39 |
|
|
|
40 |
.SH DESCRIPTION
|
|
|
41 |
.LP
|
|
|
42 |
Meld is a graphical diff and merge tool that allows a user to visually compare two or three files simultaneously and edit the files in place. Differences are updated in real-time and highlighted using color coding. Users can also compare two or three directories at a time and launch file comparisons. In addition, users can browse working copies of the code from popular version control systems including CVS, Subversion, Bazaar-ng and Mercurial.
|
|
|
43 |
|
|
|
44 |
More extensive help information for Meld is included in the graphical interface.
|
|
|
45 |
|
|
|
46 |
.SH OPTIONS
|
|
|
47 |
.sp
|
|
|
48 |
.ne 2
|
|
|
49 |
.mk
|
|
|
50 |
.na
|
|
|
51 |
\fB\fB--version\fR\fR
|
|
|
52 |
.ad
|
|
|
53 |
.RS 15n
|
|
|
54 |
.rt
|
|
|
55 |
displays the current version
|
|
|
56 |
.RE
|
|
|
57 |
|
|
|
58 |
.sp
|
|
|
59 |
.ne 2
|
|
|
60 |
.mk
|
|
|
61 |
.na
|
|
|
62 |
\fB\fB-h, --help\fR\fR
|
|
|
63 |
.ad
|
|
|
64 |
.RS 15n
|
|
|
65 |
.rt
|
|
|
66 |
displays this help information
|
|
|
67 |
.RE
|
|
|
68 |
|
|
|
69 |
.sp
|
|
|
70 |
.ne 2
|
|
|
71 |
.mk
|
|
|
72 |
.na
|
|
|
73 |
\fB\fB-L LABEL, --label=LABEL\fR\fR
|
|
|
74 |
.ad
|
|
|
75 |
.RS 15n
|
|
|
76 |
.rt
|
|
|
77 |
|
|
|
78 |
sets the tab label string for a file
|
|
|
79 |
.RE
|
|
|
80 |
|
|
|
81 |
.sp
|
|
|
82 |
.ne 2
|
|
|
83 |
.mk
|
|
|
84 |
.na
|
|
|
85 |
\fB\fB-c, --context\fR\fR
|
|
|
86 |
.ad
|
|
|
87 |
.RS 15n
|
|
|
88 |
.rt
|
|
|
89 |
|
|
|
90 |
for compatibility with diff command (ignored)
|
|
|
91 |
.RE
|
|
|
92 |
|
|
|
93 |
.sp
|
|
|
94 |
.ne 2
|
|
|
95 |
.mk
|
|
|
96 |
.na
|
|
|
97 |
\fB\fB-e, --ed\fR\fR
|
|
|
98 |
.ad
|
|
|
99 |
.RS 15n
|
|
|
100 |
.rt
|
|
|
101 |
|
|
|
102 |
for compatibility with diff command (ignored)
|
|
|
103 |
.RE
|
|
|
104 |
|
|
|
105 |
.sp
|
|
|
106 |
.ne 2
|
|
|
107 |
.mk
|
|
|
108 |
.na
|
|
|
109 |
\fB\fB-r, --recursive\fR\fR
|
|
|
110 |
.ad
|
|
|
111 |
.RS 15n
|
|
|
112 |
.rt
|
|
|
113 |
|
|
|
114 |
for compatibility with diff command (ignored)
|
|
|
115 |
.RE
|
|
|
116 |
|
|
|
117 |
.sp
|
|
|
118 |
.ne 2
|
|
|
119 |
.mk
|
|
|
120 |
.na
|
|
|
121 |
\fB\fB-u, --unified\fR\fR
|
|
|
122 |
.ad
|
|
|
123 |
.RS 15n
|
|
|
124 |
.rt
|
|
|
125 |
|
|
|
126 |
for compatibility with diff command (ignored)
|
|
|
127 |
.RE
|
|
|
128 |
|
|
|
129 |
.SH EXIT STATUS
|
|
|
130 |
.LP
|
|
|
131 |
The following exit values are returned:
|
|
|
132 |
.sp
|
|
|
133 |
.ne 2
|
|
|
134 |
.mk
|
|
|
135 |
.na
|
|
|
136 |
\fB\fB0\fR \fR
|
|
|
137 |
.ad
|
|
|
138 |
.RS 7n
|
|
|
139 |
.rt
|
|
|
140 |
Successful completion.
|
|
|
141 |
.RE
|
|
|
142 |
|
|
|
143 |
.sp
|
|
|
144 |
.ne 2
|
|
|
145 |
.mk
|
|
|
146 |
.na
|
|
|
147 |
\fB\fB>0\fR \fR
|
|
|
148 |
.ad
|
|
|
149 |
.RS 7n
|
|
|
150 |
.rt
|
|
|
151 |
An error occurred.
|
|
|
152 |
.RE
|
|
|
153 |
.SH ATTRIBUTES
|
|
|
154 |
See
|
|
|
155 |
.BR attributes (5)
|
|
|
156 |
for descriptions of the following attributes:
|
|
|
157 |
.sp
|
|
|
158 |
.TS
|
|
|
159 |
box;
|
|
|
160 |
cbp-1 | cbp-1
|
|
|
161 |
l | l .
|
|
|
162 |
ATTRIBUTE TYPE ATTRIBUTE VALUE
|
|
|
163 |
=
|
|
11
|
164 |
Availability developer/meld
|
|
0
|
165 |
=
|
|
|
166 |
Interface Stability Uncommitted
|
|
|
167 |
.TE
|
|
|
168 |
.PP
|
|
|
169 |
.SH SEE ALSO
|
|
|
170 |
.LP
|
|
|
171 |
diff(1), diff3(1)
|
|
|
172 |
.SH NOTES
|
|
|
173 |
The meld project is located at http://meld.sourceforge.net.
|
|
|
174 |
.sp
|
|
|
175 |
Source for meld is available on http://opensolaris.org.
|