Fossil SCM
Connect the horizontal merge arrow all the way over to vertical rises toward the top for nodes with u==0.
Commit
d76bc40569e78f39ba5524b1b84b9cfd30b34cab74b70bf9eee92cc9bbae5d8f
Parent
aa43709aa9f8cb7…
1 file changed
+1
-1
+1
-1
| --- src/graph.js | ||
| +++ src/graph.js | ||
| @@ -291,11 +291,11 @@ | ||
| 291 | 291 | if( p.hasOwnProperty('cu') ){ |
| 292 | 292 | var u2 = tx.rowinfo[p.cu-tx.iTopRow]; |
| 293 | 293 | var y2 = miLineY(u2); |
| 294 | 294 | drawCherrypickLine(x1,y1,null,y2); |
| 295 | 295 | } |
| 296 | - }else if( mergeOffset ){ | |
| 296 | + }else if( mergeOffset && p.u>0 ){ | |
| 297 | 297 | mergeLines[p.mo] = u.r<p.r ? -mergeOffset-mLine.w : mergeOffset; |
| 298 | 298 | x1 += mergeLines[p.mo]; |
| 299 | 299 | if( p.mo<p.id ){ |
| 300 | 300 | drawMergeLine(x1,p.y+node.h/2,null,y1); |
| 301 | 301 | } |
| 302 | 302 |
| --- src/graph.js | |
| +++ src/graph.js | |
| @@ -291,11 +291,11 @@ | |
| 291 | if( p.hasOwnProperty('cu') ){ |
| 292 | var u2 = tx.rowinfo[p.cu-tx.iTopRow]; |
| 293 | var y2 = miLineY(u2); |
| 294 | drawCherrypickLine(x1,y1,null,y2); |
| 295 | } |
| 296 | }else if( mergeOffset ){ |
| 297 | mergeLines[p.mo] = u.r<p.r ? -mergeOffset-mLine.w : mergeOffset; |
| 298 | x1 += mergeLines[p.mo]; |
| 299 | if( p.mo<p.id ){ |
| 300 | drawMergeLine(x1,p.y+node.h/2,null,y1); |
| 301 | } |
| 302 |
| --- src/graph.js | |
| +++ src/graph.js | |
| @@ -291,11 +291,11 @@ | |
| 291 | if( p.hasOwnProperty('cu') ){ |
| 292 | var u2 = tx.rowinfo[p.cu-tx.iTopRow]; |
| 293 | var y2 = miLineY(u2); |
| 294 | drawCherrypickLine(x1,y1,null,y2); |
| 295 | } |
| 296 | }else if( mergeOffset && p.u>0 ){ |
| 297 | mergeLines[p.mo] = u.r<p.r ? -mergeOffset-mLine.w : mergeOffset; |
| 298 | x1 += mergeLines[p.mo]; |
| 299 | if( p.mo<p.id ){ |
| 300 | drawMergeLine(x1,p.y+node.h/2,null,y1); |
| 301 | } |
| 302 |