Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Merge the side-by-side diff spacing bug fix into trunk. |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
54e730c339278e15a3ae8eb55797af9b |
| User & Date: | drh 2011-10-21 21:55:13.571 |
Context
|
2011-10-21
| ||
| 23:44 | Improved formatting for command-line side-by-side diff. Extend command-line side-by-side diff to all diff operations, including stash diffs. ... (check-in: ab47cc73d7 user: drh tags: trunk) | |
| 21:55 | Merge the side-by-side diff spacing bug fix into trunk. ... (check-in: 54e730c339 user: drh tags: trunk) | |
| 21:50 | Fix a spacing bug in the display of side-by-side diffs. ... (Closed-Leaf check-in: a505abccc6 user: drh tags: diff-enhancements) | |
| 21:34 | Merge the diff enhancements into trunk. ... (check-in: c244605862 user: drh tags: trunk) | |
Changes
Changes to src/diff.c.
| ︙ | ︙ | |||
429 430 431 432 433 434 435 |
blob_appendf(pOut, "%6d ", a+j);
appendSbsLine(pOut, &A[a+j], width, 1);
blob_append(pOut, " <\n", 3);
}
a += ma;
for(j=0; j<mb; j++){
appendSpace(pOut, width+7);
| | | 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 |
blob_appendf(pOut, "%6d ", a+j);
appendSbsLine(pOut, &A[a+j], width, 1);
blob_append(pOut, " <\n", 3);
}
a += ma;
for(j=0; j<mb; j++){
appendSpace(pOut, width+7);
blob_appendf(pOut, " > %6d ", b+j);
appendSbsLine(pOut, &B[b+j], width, 0);
blob_append(pOut, "\n", 1);
}
b += mb;
if( i<nr-1 ){
m = R[r+i*3+3];
for(j=0; j<m; j++){
|
| ︙ | ︙ |