1 '\" t |
|
2 .TH meld 1 "18 Nov 2010" "SunOS 5.11" "User Commands" |
|
3 .SH NAME |
|
4 meld \- graphical diff and merge tool |
|
5 .SH SYNOPSIS |
|
6 .LP |
|
7 .nf |
|
8 \fBmeld\fR [\fB--version\fR] [\fB-h\fR] [\fB--help\fR] |
|
9 \fBmeld\fR [\fB-aceru\fR] \fIfile\fR |
|
10 \fBmeld\fR [\fB-aceru\fR] \fIdir\fR |
|
11 \fBmeld\fR [\fB-aceru\fR] [\fB--diff\fR] \fIdir\fR \fIdir\fR [\fIdir\fR] |
|
12 \fBmeld\fR [\fB-aceru\fR] [\fB--diff\fR] \fIfile\fR \fIfile\fR [\fIfile\fR] |
|
13 \fBmeld\fR [\fB...\fR] [\fB-L LABEL,...\fR] [\fB--label=LABEL,...\fR] \fIfile\fR \fIfile\fR [\fIfile\fR] |
|
14 .fi |
|
15 |
|
16 .SH DESCRIPTION |
|
17 .LP |
|
18 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. |
|
19 |
|
20 More extensive help information for Meld is included in the graphical interface. |
|
21 |
|
22 .SH OPTIONS |
|
23 .sp |
|
24 .ne 2 |
|
25 .mk |
|
26 .na |
|
27 \fB\fB--version\fR\fR |
|
28 .ad |
|
29 .RS 15n |
|
30 .rt |
|
31 displays the current version |
|
32 .RE |
|
33 |
|
34 .sp |
|
35 .ne 2 |
|
36 .mk |
|
37 .na |
|
38 \fB\fB-h, --help\fR\fR |
|
39 .ad |
|
40 .RS 15n |
|
41 .rt |
|
42 displays this help information |
|
43 .RE |
|
44 |
|
45 .sp |
|
46 .ne 2 |
|
47 .mk |
|
48 .na |
|
49 \fB\fB-L LABEL, --label=LABEL\fR\fR |
|
50 .ad |
|
51 .RS 15n |
|
52 .rt |
|
53 |
|
54 sets the tab label string for a file |
|
55 .RE |
|
56 |
|
57 .sp |
|
58 .ne 2 |
|
59 .mk |
|
60 .na |
|
61 \fB\fB-a, --auto-compare\fR\fR |
|
62 .ad |
|
63 .RS 15n |
|
64 .rt |
|
65 |
|
66 automatically compare all differing files on startup |
|
67 .RE |
|
68 |
|
69 .sp |
|
70 .ne 2 |
|
71 .mk |
|
72 .na |
|
73 \fB\fB-c, --context\fR\fR |
|
74 .ad |
|
75 .RS 15n |
|
76 .rt |
|
77 |
|
78 for compatibility with diff command (ignored) |
|
79 .RE |
|
80 |
|
81 .sp |
|
82 .ne 2 |
|
83 .mk |
|
84 .na |
|
85 \fB\fB-e, --ed\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-r, --recursive\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-u, --unified\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-diff\fR\fR |
|
122 .ad |
|
123 .RS 15n |
|
124 .rt |
|
125 |
|
126 creates a diff tab for up to three supplied files or directories |
|
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 .PP |
|
154 .SH SEE ALSO |
|
155 .LP |
|
156 diff(1), diff3(1) |
|