* samtools-0.1.1-19

 * fixed a bug in "merge" command line

diff --git a/bam_sort.c b/bam_sort.c
index 68d15dc58f7cde597615a5d49aa988f7a65cd366..f089cdff396695c0cf43d21d09be695463e187c9 100644 (file)
--- a/bam_sort.c
+++ b/bam_sort.c
@@ -115,7 +115,7 @@ int bam_merge(int argc, char *argv[])
                case 'n': is_by_qname = 1; break;
                }
        }
-       if (optind + 3 >= argc) {
+       if (optind + 2 >= argc) {
                fprintf(stderr, "Usage: samtools merge [-n] <out.bam> <in1.bam> <in2.bam> [...]\n");
                return 1;
        }

diff --git a/bamtk.c b/bamtk.c
index ffd2e48804a2c3ff929c1cfe19b3b22f49275ad6..dd9aa26871b31b0e64fd3ca15e7015558318a72d 100644 (file)
--- a/bamtk.c
+++ b/bamtk.c
@@ -3,7 +3,7 @@
 #include "bam.h"
 
 #ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "0.1.1-18"
+#define PACKAGE_VERSION "0.1.1-19"
 #endif
 
 int bam_taf2baf(int argc, char *argv[]);