Fixed merge conflicts
No related branches found
No related tags found
Showing
- src/intersectFile/intersectFile.cpp 0 additions, 1 deletionsrc/intersectFile/intersectFile.cpp
- src/mapFile/mapMain.cpp 15 additions, 4 deletionssrc/mapFile/mapMain.cpp
- src/utils/BinTree/BinTree.cpp 0 additions, 7 deletionssrc/utils/BinTree/BinTree.cpp
- src/utils/Contexts/ContextBase.cpp 7 additions, 0 deletionssrc/utils/Contexts/ContextBase.cpp
- src/utils/Contexts/ContextMerge.cpp 41 additions, 24 deletionssrc/utils/Contexts/ContextMerge.cpp
- src/utils/FileRecordTools/FileReaders/BufferedStreamMgr.cpp 12 additions, 1 deletionsrc/utils/FileRecordTools/FileReaders/BufferedStreamMgr.cpp
- src/utils/FileRecordTools/FileReaders/InputStreamMgr.cpp 10 additions, 6 deletionssrc/utils/FileRecordTools/FileReaders/InputStreamMgr.cpp
- src/utils/FileRecordTools/FileReaders/InputStreamMgr.h 2 additions, 2 deletionssrc/utils/FileRecordTools/FileReaders/InputStreamMgr.h
- src/utils/FileRecordTools/FileRecordMgr.cpp 1 addition, 0 deletionssrc/utils/FileRecordTools/FileRecordMgr.cpp
- src/utils/FileRecordTools/Records/EmptyRecord.cpp 34 additions, 0 deletionssrc/utils/FileRecordTools/Records/EmptyRecord.cpp
- src/utils/FileRecordTools/Records/EmptyRecord.h 30 additions, 0 deletionssrc/utils/FileRecordTools/Records/EmptyRecord.h
- src/utils/FileRecordTools/Records/Makefile 3 additions, 3 deletionssrc/utils/FileRecordTools/Records/Makefile
- src/utils/FileRecordTools/Records/RecordMgr.cpp 24 additions, 0 deletionssrc/utils/FileRecordTools/Records/RecordMgr.cpp
- src/utils/FileRecordTools/Records/RecordMgr.h 1 addition, 0 deletionssrc/utils/FileRecordTools/Records/RecordMgr.h
- src/utils/NewChromsweep/NewChromsweep.cpp 3 additions, 3 deletionssrc/utils/NewChromsweep/NewChromsweep.cpp
- src/utils/RecordOutputMgr/RecordOutputMgr.cpp 18 additions, 7 deletionssrc/utils/RecordOutputMgr/RecordOutputMgr.cpp
- src/utils/fileType/FileRecordTypeChecker.cpp 10 additions, 7 deletionssrc/utils/fileType/FileRecordTypeChecker.cpp
- src/utils/fileType/FileRecordTypeChecker.h 8 additions, 2 deletionssrc/utils/fileType/FileRecordTypeChecker.h
- test/intersect/headerOnly.vcf 121 additions, 0 deletionstest/intersect/headerOnly.vcf
- test/intersect/new_test-intersect.sh 84 additions, 3 deletionstest/intersect/new_test-intersect.sh
Loading
Please register or sign in to comment