meld.1 2.86 KB
Newer Older
1 2 3 4 5 6 7 8 9 10 11 12 13 14
.TH MELD 1 "26 Sept 2010"
.SH NAME
\fBmeld\fP \- Visual diff and merge tool for the GNOME Desktop
.SH SYNOPSIS
\fBmeld\fR [options]
.br
\fBmeld\fR [options] FILE1
.br
\fBmeld\fR [options] DIR1
.br
\fBmeld\fR [options] FILE1 FILE2 [FILE3]
.br
\fBmeld\fR [options] DIR1 DIR2 [DIR3]
.SH DESCRIPTION
15
\fBMeld\fR is a graphical diff viewer and merge application for the GNOME
16
desktop.  It supports 2 and 3-file diffs, recursive directory diffs, diffing
17 18 19
of directories under version control (Bazaar, CVS, Darcs, Fossil, Git,
Mercurial, Monotone), as well as the ability to manually and automatically
merge file differences.
20 21 22 23 24 25
.SH OPTIONS
.TP
\fB\-\-auto-compare, \-a\fR
.br
Automatically compare all differing files on startup.
.TP
26 27 28 29 30 31 32 33
\fB\-\-auto\-merge\fR
.br
Automatically merge files
.TP
\fB\-\-comparison\-file=<file>\fR
.br
Load a saved comparison from a Meld comparison file
.TP
34 35 36 37 38 39 40 41 42 43 44 45 46
\fB\-\-diff FILE1|DIR1 FILE2|DIR2 [FILE3|DIR3]\fR
.br
Create a diff tab for the given files or directories.
Note that "\fBmeld\fR \-\-diff FILE1 FILE2" is functionally equivalent
to "\fBmeld\fR FILE1 FILE2".  However, the \fB\-\-diff\fR argument can
be given multiple times for one invocation of \fBmeld\fR which allows
the user to automatically initiate multiple diffs when \fBmeld\fR starts.
See examples below.
.TP
\fB\-\-help, \-h\fR
.br
Print application help and usage.
.TP
47
\fB\-\-label=<label>, \-L <label>\fR
48 49 50
.br
Set application window title to <label>.
.TP
51 52 53 54 55 56 57 58 59 60 61 62 63 64
\fB\-\-newtab, \-n\fR
.br
Open the comparison as a new tab in an already-running instance.
.TP
\fB\-\-output, \-o\fR
.br
Sets the save path for the middle buffer in a three-pane merge view. This is
useful for loading the middle buffer from one file and saving it to another,
for example in use as a version control merge helper.
.TP
\fB\-\-unified, \-u\fR
.br
Ignored for compatibility
.TP
65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97
\fB\-\-version\fR
.br
Print application version and exit.
.SH EXAMPLES
.TP
\fBmeld\fR
.br
Run \fBmeld\fR without initiating a diff.
.TP
\fBmeld\fR FILE1
.br
Initiate a diff between FILE1 and the version-controlled copy of FILE1.
.TP
\fBmeld\fR DIR1
.br
Initiate a recursive diff between DIR1 and the version-controlled copy of DIR1.
.TP
\fBmeld\fR FILE1 FILE2
.br
Initiate a diff between FILE1 and FILE2.
.TP
\fBmeld\fR FILE1 FILE2 FILE3
.br
Initiate a 3-way diff between FILE1, FILE2, and FILE3.
.TP
\fBmeld\fR DIR1 DIR2
.br
Initiate a recursive diff between directory DIR1 and DIR2.
.TP
\fBmeld\fR DIR1 DIR2 DIR3
.br
Initiate a recursive 3-way diff between directory DIR1, DIR2, and DIR3.
.TP
Boruch Baum's avatar
Boruch Baum committed
98
\fBmeld\fR \-\-diff FILE1 FILE2 \-\-diff FILE3 FILE4
99 100 101 102 103
.br
Initiate a diff between FILE1 and FILE2, and a separate diff between FILE3 and
FILE4.
.SH BUGS
If you find a bug, please report it at
104
https://gitlab.gnome.org/GNOME/meld/issues or mail a description of
105 106 107 108
the issue to meld-list@gnome.org.
.SH AUTHORS
See the AUTHORS text file in \fBmeld's\fR source code
(http://git.gnome.org/browse/meld/tree/AUTHORS).