Show More
@@ -195,6 +195,9 b' class Merge3Text(object):' | |||||
195 | 'a', start, end |
|
195 | 'a', start, end | |
196 | Non-clashing insertion from a[start:end] |
|
196 | Non-clashing insertion from a[start:end] | |
197 |
|
197 | |||
|
198 | 'conflict', zstart, zend, astart, aend, bstart, bend | |||
|
199 | Conflict between a and b, with z as common ancestor | |||
|
200 | ||||
198 | Method is as follows: |
|
201 | Method is as follows: | |
199 |
|
202 | |||
200 | The two sequences align only on regions which match the base |
|
203 | The two sequences align only on regions which match the base |
General Comments 0
You need to be logged in to leave comments.
Login now