 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 # DEALINGS IN THE SOFTWARE.
-diff -uprN -x '*_Jul11' -x 'ibm_*' -x 'Numer*' -x a.out -x '#*#' -x version.h -x q -x '*~' -x '*.c.*' -x '*.a' -x .git -x .svn -x '*.MIT' -x '*.swp' 00_svn_r2/samtools-2015-08-19/samtools/bam_sam2bam.c ../files/samtools/bam_sam2bam.c
+diff -uprN -x '*_Jul11' -x 'ibm_*' -x 'Numer*' -x a.out -x '#*#' -x version.h -x q -x '*~' -x '*.c.*' -x '*.a' -x .git -x .svn -x '*.MIT' -x '*.swp' -x 'svn-commit.tmp*' 00_svn_r2/samtools-2015-08-19/samtools/bam_sam2bam.c ../files/samtools/bam_sam2bam.c
 --- 00_svn_r2/samtools-2015-08-19/samtools/bam_sam2bam.c	1970-01-01 09:00:00.000000000 +0900
-+++ ../files/samtools/bam_sam2bam.c	2016-10-31 18:32:09.739945744 +0900
-@@ -0,0 +1,7915 @@
++++ ../files/samtools/bam_sam2bam.c	2016-12-01 14:57:55.686907391 +0900
+@@ -0,0 +1,7925 @@
 +#define _BAM_SAM2BAM_C
 +/*  bam_sam2bam.c
 +

+#endif
+
+
diff -uprN -x '*_Jul11' -x 'ibm_*' -x 'Numer*' -x a.out -x '#*#' -x version.h -x q -x '*~' -x '*.c.*' -x '*.a' -x .git -x .svn -x '*.MIT' -x '*.swp' 00_svn_r2/samtools-2015-08-19/samtools/bam_sort.c ../files/samtools/bam_sort.c
--- 00_svn_r2/samtools-2015-08-19/samtools/bam_sort.c	2015-08-19 17:55:53.807903000 +0900
+++ ../files/samtools/bam_sort.c	2015-10-13 18:59:54.830266751 +0900
@@ -796,7 +796,7 @@ int bam_merge_core2(int by_qname, const 

     if (is_header_only) goto view_end; // no need to print alignments
 
     if (optind + 1 >= argc) { // convert/print the entire file
diff -uprN -x '*_Jul11' -x 'ibm_*' -x 'Numer*' -x a.out -x '#*#' -x version.h -x q -x '*~' -x '*.c.*' -x '*.a' -x .git -x .svn -x '*.MIT' -x '*.swp' -x 'svn-commit.tmp*' 00_svn_r2/samtools-2015-08-19/samtools/test.c ../files/samtools/test.c
--- 00_svn_r2/samtools-2015-08-19/samtools/test.c	1970-01-01 09:00:00.000000000 +0900
+++ ../files/samtools/test.c	2016-01-25 18:56:16.570978207 +0900
@@ -0,0 +1,19 @@
