Fossil SCM
Ensure that there is always a newline before a conflict mark in merge output.
Commit
b491c196c23ec4a240f4e9558791fbe7e34ea98b17cfd4edaba0c641a4fea216
Parent
b46872985550604…
1 file changed
+1
+1
| --- src/merge3.c | ||
| +++ src/merge3.c | ||
| @@ -317,10 +317,11 @@ | ||
| 317 | 317 | nConflict++; |
| 318 | 318 | while( !ends_at_CPY(&aC1[i1], sz) || !ends_at_CPY(&aC2[i2], sz) ){ |
| 319 | 319 | sz++; |
| 320 | 320 | } |
| 321 | 321 | DEBUG( printf("CONFLICT %d\n", sz); ) |
| 322 | + ensure_line_end(pOut, useCrLf); | |
| 322 | 323 | blob_append(pOut, mergeMarker[0], -1); |
| 323 | 324 | ensure_line_end(pOut, useCrLf); |
| 324 | 325 | i1 = output_one_side(pOut, pV1, aC1, i1, sz); |
| 325 | 326 | ensure_line_end(pOut, useCrLf); |
| 326 | 327 | blob_append(pOut, mergeMarker[1], -1); |
| 327 | 328 |
| --- src/merge3.c | |
| +++ src/merge3.c | |
| @@ -317,10 +317,11 @@ | |
| 317 | nConflict++; |
| 318 | while( !ends_at_CPY(&aC1[i1], sz) || !ends_at_CPY(&aC2[i2], sz) ){ |
| 319 | sz++; |
| 320 | } |
| 321 | DEBUG( printf("CONFLICT %d\n", sz); ) |
| 322 | blob_append(pOut, mergeMarker[0], -1); |
| 323 | ensure_line_end(pOut, useCrLf); |
| 324 | i1 = output_one_side(pOut, pV1, aC1, i1, sz); |
| 325 | ensure_line_end(pOut, useCrLf); |
| 326 | blob_append(pOut, mergeMarker[1], -1); |
| 327 |
| --- src/merge3.c | |
| +++ src/merge3.c | |
| @@ -317,10 +317,11 @@ | |
| 317 | nConflict++; |
| 318 | while( !ends_at_CPY(&aC1[i1], sz) || !ends_at_CPY(&aC2[i2], sz) ){ |
| 319 | sz++; |
| 320 | } |
| 321 | DEBUG( printf("CONFLICT %d\n", sz); ) |
| 322 | ensure_line_end(pOut, useCrLf); |
| 323 | blob_append(pOut, mergeMarker[0], -1); |
| 324 | ensure_line_end(pOut, useCrLf); |
| 325 | i1 = output_one_side(pOut, pV1, aC1, i1, sz); |
| 326 | ensure_line_end(pOut, useCrLf); |
| 327 | blob_append(pOut, mergeMarker[1], -1); |
| 328 |