Fossil SCM
Merge the side-by-side diff spacing bug fix into trunk.
Commit
54e730c339278e15a3ae8eb55797af9b7a8b63c8
Parent
c24460586287cba…
1 file changed
+1
-1
+1
-1
| --- src/diff.c | ||
| +++ src/diff.c | ||
| @@ -431,11 +431,11 @@ | ||
| 431 | 431 | blob_append(pOut, " <\n", 3); |
| 432 | 432 | } |
| 433 | 433 | a += ma; |
| 434 | 434 | for(j=0; j<mb; j++){ |
| 435 | 435 | appendSpace(pOut, width+7); |
| 436 | - blob_appendf(pOut, " > %6d", b+j); | |
| 436 | + blob_appendf(pOut, " > %6d ", b+j); | |
| 437 | 437 | appendSbsLine(pOut, &B[b+j], width, 0); |
| 438 | 438 | blob_append(pOut, "\n", 1); |
| 439 | 439 | } |
| 440 | 440 | b += mb; |
| 441 | 441 | if( i<nr-1 ){ |
| 442 | 442 |
| --- src/diff.c | |
| +++ src/diff.c | |
| @@ -431,11 +431,11 @@ | |
| 431 | blob_append(pOut, " <\n", 3); |
| 432 | } |
| 433 | a += ma; |
| 434 | for(j=0; j<mb; j++){ |
| 435 | appendSpace(pOut, width+7); |
| 436 | blob_appendf(pOut, " > %6d", b+j); |
| 437 | appendSbsLine(pOut, &B[b+j], width, 0); |
| 438 | blob_append(pOut, "\n", 1); |
| 439 | } |
| 440 | b += mb; |
| 441 | if( i<nr-1 ){ |
| 442 |
| --- src/diff.c | |
| +++ src/diff.c | |
| @@ -431,11 +431,11 @@ | |
| 431 | blob_append(pOut, " <\n", 3); |
| 432 | } |
| 433 | a += ma; |
| 434 | for(j=0; j<mb; j++){ |
| 435 | appendSpace(pOut, width+7); |
| 436 | blob_appendf(pOut, " > %6d ", b+j); |
| 437 | appendSbsLine(pOut, &B[b+j], width, 0); |
| 438 | blob_append(pOut, "\n", 1); |
| 439 | } |
| 440 | b += mb; |
| 441 | if( i<nr-1 ){ |
| 442 |