Fossil SCM
Fix a bug in text-merge for the case when the same change occurs along both branches.
Commit
58c74fc5c729ee9a33ac420e5592617ae8bbc011efb66663afe22aa0e360157d
Parent
565a49062c741c9…
1 file changed
+1
-1
+1
-1
| --- src/merge3.c | ||
| +++ src/merge3.c | ||
| @@ -392,11 +392,11 @@ | ||
| 392 | 392 | blob_copy_lines(0, p->pV1, nPivot); p->lnV1 += nPivot; |
| 393 | 393 | blob_copy_lines(p->pOut, p->pV2, nV2); p->lnV2 += nV2; |
| 394 | 394 | } |
| 395 | 395 | static void txtChngBoth(MergeBuilder *p, unsigned int nPivot, unsigned int nV){ |
| 396 | 396 | blob_copy_lines(0, p->pPivot, nPivot); p->lnPivot += nPivot; |
| 397 | - blob_copy_lines(0, p->pV1, nPivot); p->lnV1 += nV; | |
| 397 | + blob_copy_lines(0, p->pV1, nV); p->lnV1 += nV; | |
| 398 | 398 | blob_copy_lines(p->pOut, p->pV2, nV); p->lnV2 += nV; |
| 399 | 399 | } |
| 400 | 400 | static void txtConflict( |
| 401 | 401 | MergeBuilder *p, |
| 402 | 402 | unsigned int nPivot, |
| 403 | 403 |
| --- src/merge3.c | |
| +++ src/merge3.c | |
| @@ -392,11 +392,11 @@ | |
| 392 | blob_copy_lines(0, p->pV1, nPivot); p->lnV1 += nPivot; |
| 393 | blob_copy_lines(p->pOut, p->pV2, nV2); p->lnV2 += nV2; |
| 394 | } |
| 395 | static void txtChngBoth(MergeBuilder *p, unsigned int nPivot, unsigned int nV){ |
| 396 | blob_copy_lines(0, p->pPivot, nPivot); p->lnPivot += nPivot; |
| 397 | blob_copy_lines(0, p->pV1, nPivot); p->lnV1 += nV; |
| 398 | blob_copy_lines(p->pOut, p->pV2, nV); p->lnV2 += nV; |
| 399 | } |
| 400 | static void txtConflict( |
| 401 | MergeBuilder *p, |
| 402 | unsigned int nPivot, |
| 403 |
| --- src/merge3.c | |
| +++ src/merge3.c | |
| @@ -392,11 +392,11 @@ | |
| 392 | blob_copy_lines(0, p->pV1, nPivot); p->lnV1 += nPivot; |
| 393 | blob_copy_lines(p->pOut, p->pV2, nV2); p->lnV2 += nV2; |
| 394 | } |
| 395 | static void txtChngBoth(MergeBuilder *p, unsigned int nPivot, unsigned int nV){ |
| 396 | blob_copy_lines(0, p->pPivot, nPivot); p->lnPivot += nPivot; |
| 397 | blob_copy_lines(0, p->pV1, nV); p->lnV1 += nV; |
| 398 | blob_copy_lines(p->pOut, p->pV2, nV); p->lnV2 += nV; |
| 399 | } |
| 400 | static void txtConflict( |
| 401 | MergeBuilder *p, |
| 402 | unsigned int nPivot, |
| 403 |