[meld] meld.1: Update man page options listing



commit 990e08ecfa06cc7a42da455ea26af05a5d577d0a
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sun Jun 7 08:13:24 2015 +1000

    meld.1: Update man page options listing

 meld.1 |   22 ++++++++++++++++++++++
 1 files changed, 22 insertions(+), 0 deletions(-)
---
diff --git a/meld.1 b/meld.1
index d7b635b..7b582b1 100644
--- a/meld.1
+++ b/meld.1
@@ -23,6 +23,14 @@ merge file differences.
 .br
 Automatically compare all differing files on startup.
 .TP
+\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
 \fB\-\-diff FILE1|DIR1 FILE2|DIR2 [FILE3|DIR3]\fR
 .br
 Create a diff tab for the given files or directories.
@@ -40,6 +48,20 @@ Print application help and usage.
 .br
 Set application window title to <label>.
 .TP
+\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
 \fB\-\-version\fR
 .br
 Print application version and exit.


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]