author | Cyril Plisko <cyril.plisko@grigale.com> |
Thu, 16 Dec 2010 05:01:21 -0800 | |
changeset 58 | 2605957be88f |
parent 11 | 87960ed158f9 |
permissions | -rw-r--r-- |
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 |
.\" |
|
58
2605957be88f
Import sfw build 155
Cyril Plisko <cyril.plisko@grigale.com>
parents:
11
diff
changeset
|
22 |
.\" Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. |
0 | 23 |
.\" |
58
2605957be88f
Import sfw build 155
Cyril Plisko <cyril.plisko@grigale.com>
parents:
11
diff
changeset
|
24 |
.\" ident "@(#)meld.1 1.3 10/11/22 SMI" |
0 | 25 |
.\" |
58
2605957be88f
Import sfw build 155
Cyril Plisko <cyril.plisko@grigale.com>
parents:
11
diff
changeset
|
26 |
.TH meld 1 "18 Nov 2010" "SunOS 5.11" "User Commands" |
0 | 27 |
.SH NAME |
28 |
meld \- graphical diff and merge tool |
|
29 |
.SH SYNOPSIS |
|
30 |
.LP |
|
31 |
.nf |
|
32 |
\fBmeld\fR [\fB--version\fR] [\fB-h\fR] [\fB--help\fR] |
|
58
2605957be88f
Import sfw build 155
Cyril Plisko <cyril.plisko@grigale.com>
parents:
11
diff
changeset
|
33 |
\fBmeld\fR [\fB-aceru\fR] \fIfile\fR |
2605957be88f
Import sfw build 155
Cyril Plisko <cyril.plisko@grigale.com>
parents:
11
diff
changeset
|
34 |
\fBmeld\fR [\fB-aceru\fR] \fIdir\fR |
2605957be88f
Import sfw build 155
Cyril Plisko <cyril.plisko@grigale.com>
parents:
11
diff
changeset
|
35 |
\fBmeld\fR [\fB-aceru\fR] [\fB--diff\fR] \fIdir\fR \fIdir\fR [\fIdir\fR] |
2605957be88f
Import sfw build 155
Cyril Plisko <cyril.plisko@grigale.com>
parents:
11
diff
changeset
|
36 |
\fBmeld\fR [\fB-aceru\fR] [\fB--diff\fR] \fIfile\fR \fIfile\fR [\fIfile\fR] |
2605957be88f
Import sfw build 155
Cyril Plisko <cyril.plisko@grigale.com>
parents:
11
diff
changeset
|
37 |
\fBmeld\fR [\fB...\fR] [\fB-L LABEL,...\fR] [\fB--label=LABEL,...\fR] \fIfile\fR \fIfile\fR [\fIfile\fR] |
0 | 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 |
|
58
2605957be88f
Import sfw build 155
Cyril Plisko <cyril.plisko@grigale.com>
parents:
11
diff
changeset
|
85 |
\fB\fB-a, --auto-compare\fR\fR |
2605957be88f
Import sfw build 155
Cyril Plisko <cyril.plisko@grigale.com>
parents:
11
diff
changeset
|
86 |
.ad |
2605957be88f
Import sfw build 155
Cyril Plisko <cyril.plisko@grigale.com>
parents:
11
diff
changeset
|
87 |
.RS 15n |
2605957be88f
Import sfw build 155
Cyril Plisko <cyril.plisko@grigale.com>
parents:
11
diff
changeset
|
88 |
.rt |
2605957be88f
Import sfw build 155
Cyril Plisko <cyril.plisko@grigale.com>
parents:
11
diff
changeset
|
89 |
|
2605957be88f
Import sfw build 155
Cyril Plisko <cyril.plisko@grigale.com>
parents:
11
diff
changeset
|
90 |
automatically compare all differing files on startup |
2605957be88f
Import sfw build 155
Cyril Plisko <cyril.plisko@grigale.com>
parents:
11
diff
changeset
|
91 |
.RE |
2605957be88f
Import sfw build 155
Cyril Plisko <cyril.plisko@grigale.com>
parents:
11
diff
changeset
|
92 |
|
2605957be88f
Import sfw build 155
Cyril Plisko <cyril.plisko@grigale.com>
parents:
11
diff
changeset
|
93 |
.sp |
2605957be88f
Import sfw build 155
Cyril Plisko <cyril.plisko@grigale.com>
parents:
11
diff
changeset
|
94 |
.ne 2 |
2605957be88f
Import sfw build 155
Cyril Plisko <cyril.plisko@grigale.com>
parents:
11
diff
changeset
|
95 |
.mk |
2605957be88f
Import sfw build 155
Cyril Plisko <cyril.plisko@grigale.com>
parents:
11
diff
changeset
|
96 |
.na |
0 | 97 |
\fB\fB-c, --context\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-e, --ed\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-r, --recursive\fR\fR |
|
122 |
.ad |
|
123 |
.RS 15n |
|
124 |
.rt |
|
125 |
||
126 |
for compatibility with diff command (ignored) |
|
127 |
.RE |
|
128 |
||
129 |
.sp |
|
130 |
.ne 2 |
|
131 |
.mk |
|
132 |
.na |
|
133 |
\fB\fB-u, --unified\fR\fR |
|
134 |
.ad |
|
135 |
.RS 15n |
|
136 |
.rt |
|
137 |
||
138 |
for compatibility with diff command (ignored) |
|
139 |
.RE |
|
140 |
||
58
2605957be88f
Import sfw build 155
Cyril Plisko <cyril.plisko@grigale.com>
parents:
11
diff
changeset
|
141 |
.sp |
2605957be88f
Import sfw build 155
Cyril Plisko <cyril.plisko@grigale.com>
parents:
11
diff
changeset
|
142 |
.ne 2 |
2605957be88f
Import sfw build 155
Cyril Plisko <cyril.plisko@grigale.com>
parents:
11
diff
changeset
|
143 |
.mk |
2605957be88f
Import sfw build 155
Cyril Plisko <cyril.plisko@grigale.com>
parents:
11
diff
changeset
|
144 |
.na |
2605957be88f
Import sfw build 155
Cyril Plisko <cyril.plisko@grigale.com>
parents:
11
diff
changeset
|
145 |
\fB\fB-diff\fR\fR |
2605957be88f
Import sfw build 155
Cyril Plisko <cyril.plisko@grigale.com>
parents:
11
diff
changeset
|
146 |
.ad |
2605957be88f
Import sfw build 155
Cyril Plisko <cyril.plisko@grigale.com>
parents:
11
diff
changeset
|
147 |
.RS 15n |
2605957be88f
Import sfw build 155
Cyril Plisko <cyril.plisko@grigale.com>
parents:
11
diff
changeset
|
148 |
.rt |
2605957be88f
Import sfw build 155
Cyril Plisko <cyril.plisko@grigale.com>
parents:
11
diff
changeset
|
149 |
|
2605957be88f
Import sfw build 155
Cyril Plisko <cyril.plisko@grigale.com>
parents:
11
diff
changeset
|
150 |
creates a diff tab for up to three supplied files or directories |
2605957be88f
Import sfw build 155
Cyril Plisko <cyril.plisko@grigale.com>
parents:
11
diff
changeset
|
151 |
.RE |
2605957be88f
Import sfw build 155
Cyril Plisko <cyril.plisko@grigale.com>
parents:
11
diff
changeset
|
152 |
|
0 | 153 |
.SH EXIT STATUS |
154 |
.LP |
|
155 |
The following exit values are returned: |
|
156 |
.sp |
|
157 |
.ne 2 |
|
158 |
.mk |
|
159 |
.na |
|
160 |
\fB\fB0\fR \fR |
|
161 |
.ad |
|
162 |
.RS 7n |
|
163 |
.rt |
|
164 |
Successful completion. |
|
165 |
.RE |
|
166 |
||
167 |
.sp |
|
168 |
.ne 2 |
|
169 |
.mk |
|
170 |
.na |
|
171 |
\fB\fB>0\fR \fR |
|
172 |
.ad |
|
173 |
.RS 7n |
|
174 |
.rt |
|
175 |
An error occurred. |
|
176 |
.RE |
|
177 |
.SH ATTRIBUTES |
|
178 |
See |
|
179 |
.BR attributes (5) |
|
180 |
for descriptions of the following attributes: |
|
181 |
.sp |
|
182 |
.TS |
|
183 |
box; |
|
184 |
cbp-1 | cbp-1 |
|
185 |
l | l . |
|
186 |
ATTRIBUTE TYPE ATTRIBUTE VALUE |
|
187 |
= |
|
11 | 188 |
Availability developer/meld |
0 | 189 |
= |
190 |
Interface Stability Uncommitted |
|
191 |
.TE |
|
192 |
.PP |
|
193 |
.SH SEE ALSO |
|
194 |
.LP |
|
195 |
diff(1), diff3(1) |
|
196 |
.SH NOTES |
|
197 |
The meld project is located at http://meld.sourceforge.net. |
|
198 |
.sp |
|
199 |
Source for meld is available on http://opensolaris.org. |