Fossil SCM
Fix a minor fault in the graph drawing javascript.
Commit
3a15daaa3f193b519d4fd110292fa65fa8bd18313605e886ea2f1f4888dab561
Parent
759fbda4e8963d8…
1 file changed
+1
-1
+1
-1
| --- src/graph.js | ||
| +++ src/graph.js | ||
| @@ -450,11 +450,11 @@ | ||
| 450 | 450 | drawCherrypickLine(x1,y1,null,y2); |
| 451 | 451 | } |
| 452 | 452 | }else if( mergeOffset ){ |
| 453 | 453 | mergeLines[p.mo] = u.r<p.r ? -mergeOffset-mLine.w : mergeOffset; |
| 454 | 454 | x1 += mergeLines[p.mo]; |
| 455 | - if( p.mo<p.id ){ | |
| 455 | + if( p.mu<p.id ){ | |
| 456 | 456 | drawMergeLine(x1,p.y+node.h/2,null,y1); |
| 457 | 457 | } |
| 458 | 458 | if( p.hasOwnProperty('cu') ){ |
| 459 | 459 | var u2 = tx.rowinfo[p.cu-tx.iTopRow]; |
| 460 | 460 | var y2 = miLineY(u2); |
| 461 | 461 |
| --- src/graph.js | |
| +++ src/graph.js | |
| @@ -450,11 +450,11 @@ | |
| 450 | drawCherrypickLine(x1,y1,null,y2); |
| 451 | } |
| 452 | }else if( mergeOffset ){ |
| 453 | mergeLines[p.mo] = u.r<p.r ? -mergeOffset-mLine.w : mergeOffset; |
| 454 | x1 += mergeLines[p.mo]; |
| 455 | if( p.mo<p.id ){ |
| 456 | drawMergeLine(x1,p.y+node.h/2,null,y1); |
| 457 | } |
| 458 | if( p.hasOwnProperty('cu') ){ |
| 459 | var u2 = tx.rowinfo[p.cu-tx.iTopRow]; |
| 460 | var y2 = miLineY(u2); |
| 461 |
| --- src/graph.js | |
| +++ src/graph.js | |
| @@ -450,11 +450,11 @@ | |
| 450 | drawCherrypickLine(x1,y1,null,y2); |
| 451 | } |
| 452 | }else if( mergeOffset ){ |
| 453 | mergeLines[p.mo] = u.r<p.r ? -mergeOffset-mLine.w : mergeOffset; |
| 454 | x1 += mergeLines[p.mo]; |
| 455 | if( p.mu<p.id ){ |
| 456 | drawMergeLine(x1,p.y+node.h/2,null,y1); |
| 457 | } |
| 458 | if( p.hasOwnProperty('cu') ){ |
| 459 | var u2 = tx.rowinfo[p.cu-tx.iTopRow]; |
| 460 | var y2 = miLineY(u2); |
| 461 |