Fossil SCM
Treat whitespace at the end of lines as significant during a merge.
Commit
1d93222627a3be27face3d8f3da2068e9226c1ea
Parent
60c2feea084ba6e…
1 file changed
+2
-2
+2
-2
| --- src/merge3.c | ||
| +++ src/merge3.c | ||
| @@ -168,12 +168,12 @@ | ||
| 168 | 168 | ** is the number of lines of text to copy directly from the pivot, |
| 169 | 169 | ** the second integer is the number of lines of text to omit from the |
| 170 | 170 | ** pivot, and the third integer is the number of lines of text that are |
| 171 | 171 | ** inserted. The edit array ends with a triple of 0,0,0. |
| 172 | 172 | */ |
| 173 | - aC1 = text_diff(pPivot, pV1, 0, 0, 1); | |
| 174 | - aC2 = text_diff(pPivot, pV2, 0, 0, 1); | |
| 173 | + aC1 = text_diff(pPivot, pV1, 0, 0, 0); | |
| 174 | + aC2 = text_diff(pPivot, pV2, 0, 0, 0); | |
| 175 | 175 | if( aC1==0 || aC2==0 ){ |
| 176 | 176 | free(aC1); |
| 177 | 177 | free(aC2); |
| 178 | 178 | return -1; |
| 179 | 179 | } |
| 180 | 180 |
| --- src/merge3.c | |
| +++ src/merge3.c | |
| @@ -168,12 +168,12 @@ | |
| 168 | ** is the number of lines of text to copy directly from the pivot, |
| 169 | ** the second integer is the number of lines of text to omit from the |
| 170 | ** pivot, and the third integer is the number of lines of text that are |
| 171 | ** inserted. The edit array ends with a triple of 0,0,0. |
| 172 | */ |
| 173 | aC1 = text_diff(pPivot, pV1, 0, 0, 1); |
| 174 | aC2 = text_diff(pPivot, pV2, 0, 0, 1); |
| 175 | if( aC1==0 || aC2==0 ){ |
| 176 | free(aC1); |
| 177 | free(aC2); |
| 178 | return -1; |
| 179 | } |
| 180 |
| --- src/merge3.c | |
| +++ src/merge3.c | |
| @@ -168,12 +168,12 @@ | |
| 168 | ** is the number of lines of text to copy directly from the pivot, |
| 169 | ** the second integer is the number of lines of text to omit from the |
| 170 | ** pivot, and the third integer is the number of lines of text that are |
| 171 | ** inserted. The edit array ends with a triple of 0,0,0. |
| 172 | */ |
| 173 | aC1 = text_diff(pPivot, pV1, 0, 0, 0); |
| 174 | aC2 = text_diff(pPivot, pV2, 0, 0, 0); |
| 175 | if( aC1==0 || aC2==0 ){ |
| 176 | free(aC1); |
| 177 | free(aC2); |
| 178 | return -1; |
| 179 | } |
| 180 |