From: Heng Li <lh3@live.co.uk>
Date: Fri, 23 Jan 2009 19:22:59 +0000 (+0000)
Subject:  * samtools-0.1.1-19
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=fb6c8f27788dc657f1dc20dae3f90c3e617279d7;p=samtools.git

 * samtools-0.1.1-19
 * fixed a bug in "merge" command line
---

diff --git a/bam_sort.c b/bam_sort.c
index 68d15dc..f089cdf 100644
--- 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 ffd2e48..dd9aa26 100644
--- 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[]);