Fixed old conflict patool.1 man page

doc/patool.1

@@ -100,13 +100,9 @@ Set the verbose option to 1 or 0.
 .SS \fB[\fP\fI<archive format>\fP\fB]\fP
 Supported archive formats are listed by the \fBformats\fP command.
 .TP
-\fImode\fP\fB=/usr/bin/mycommand\fP
+\fIcommand\fP\fB=/usr/bin/mycommand\fP
-Set the application to handle the archive format for given mode.
+Set the application to handle the archive format for given command.
-<<<<<<< HEAD
+\fIcommand\fP can be one of (\fBextract\fP, \fBlist\fP, \fBtest\fP, \fBcreate\fP).
-\fImode\fP can be one of (\fBextract\fP, \fBlist\fP, \fBcreate\fP).
-=======
-\fImode\fP can be one of \fBextract\fP, \fBlist\fP, \fBtest\fP.
->>>>>>> master
 .SH FILES
 \fB/etc/patool.conf\fP, \fB~/.patool.conf\fP -
 configuration files

doc/patool.txt

@@ -41,6 +41,17 @@ COMMANDS
 
        --help Show help for this command.
 
+   create
+       Create an archive from given files.
+
+       --force
+              Allow overwriting of local archives.
+
+       --verbose
+              Verbose operation (if the helper application supports it).
+
+       --help Show help for this command.
+
    test
        Test files in an archive.
 
@@ -71,8 +82,8 @@ CONFIGURATION
    [<archive format>]
        Supported archive formats are listed by the formats command.
 
-       mode=/usr/bin/mycommand
+       command=/usr/bin/mycommand
-              Set the application to handle the archive format for given mode.  mode can be one of extract, list, test.
+              Set the application to handle the archive format for given command.  command can be one of (extract, list, test, create).
 
 FILES
        /etc/patool.conf, ~/.patool.conf - configuration files