Fossil SCM
Fix the diff block alignment so that it correctly suppresses unnecessary diff marks, even when in ignore-whitespace mode.
Commit
85ca2fe5b588e28b66d50f20e6a4daf84dade6bc5afcc4cfcf23097269d010ae
Parent
ca6fa4b2f3d12ae…
1 file changed
+1
-1
+1
-1
| --- src/diff.c | ||
| +++ src/diff.c | ||
| @@ -2107,11 +2107,11 @@ | ||
| 2107 | 2107 | b++; |
| 2108 | 2108 | break; |
| 2109 | 2109 | } |
| 2110 | 2110 | case 3: { |
| 2111 | 2111 | /* The left line is changed into the right line */ |
| 2112 | - if( compare_dline(&A[a], &B[b])==0 ){ | |
| 2112 | + if( p->xDiffer(&A[a], &B[b])==0 ){ | |
| 2113 | 2113 | pBuilder->xCommon(pBuilder, &A[a]); |
| 2114 | 2114 | }else{ |
| 2115 | 2115 | pBuilder->xEdit(pBuilder, &A[a], &B[b]); |
| 2116 | 2116 | } |
| 2117 | 2117 | assert( ma>0 && mb>0 ); |
| 2118 | 2118 |
| --- src/diff.c | |
| +++ src/diff.c | |
| @@ -2107,11 +2107,11 @@ | |
| 2107 | b++; |
| 2108 | break; |
| 2109 | } |
| 2110 | case 3: { |
| 2111 | /* The left line is changed into the right line */ |
| 2112 | if( compare_dline(&A[a], &B[b])==0 ){ |
| 2113 | pBuilder->xCommon(pBuilder, &A[a]); |
| 2114 | }else{ |
| 2115 | pBuilder->xEdit(pBuilder, &A[a], &B[b]); |
| 2116 | } |
| 2117 | assert( ma>0 && mb>0 ); |
| 2118 |
| --- src/diff.c | |
| +++ src/diff.c | |
| @@ -2107,11 +2107,11 @@ | |
| 2107 | b++; |
| 2108 | break; |
| 2109 | } |
| 2110 | case 3: { |
| 2111 | /* The left line is changed into the right line */ |
| 2112 | if( p->xDiffer(&A[a], &B[b])==0 ){ |
| 2113 | pBuilder->xCommon(pBuilder, &A[a]); |
| 2114 | }else{ |
| 2115 | pBuilder->xEdit(pBuilder, &A[a], &B[b]); |
| 2116 | } |
| 2117 | assert( ma>0 && mb>0 ); |
| 2118 |