Fossil SCM
Swapped incorrect diff argument order for /json/wiki/diff.
Commit
08197f963458d6c8427c84f61540621204c8de9e
Parent
62627615e7fd437…
1 file changed
+1
-1
+1
-1
| --- src/json_wiki.c | ||
| +++ src/json_wiki.c | ||
| @@ -546,11 +546,11 @@ | ||
| 546 | 546 | blob_init(&w1, pW1->zWiki, -1); |
| 547 | 547 | blob_zero(&w2); |
| 548 | 548 | blob_init(&w2, pW2->zWiki, -1); |
| 549 | 549 | blob_zero(&d); |
| 550 | 550 | diffFlags = DIFF_IGNORE_EOLWS | DIFF_STRIP_EOLCR; |
| 551 | - text_diff(&w2, &w1, &d, 0, diffFlags); | |
| 551 | + text_diff(&w1, &w2, &d, 0, diffFlags); | |
| 552 | 552 | blob_reset(&w1); |
| 553 | 553 | blob_reset(&w2); |
| 554 | 554 | |
| 555 | 555 | pay = cson_new_object(); |
| 556 | 556 | |
| 557 | 557 |
| --- src/json_wiki.c | |
| +++ src/json_wiki.c | |
| @@ -546,11 +546,11 @@ | |
| 546 | blob_init(&w1, pW1->zWiki, -1); |
| 547 | blob_zero(&w2); |
| 548 | blob_init(&w2, pW2->zWiki, -1); |
| 549 | blob_zero(&d); |
| 550 | diffFlags = DIFF_IGNORE_EOLWS | DIFF_STRIP_EOLCR; |
| 551 | text_diff(&w2, &w1, &d, 0, diffFlags); |
| 552 | blob_reset(&w1); |
| 553 | blob_reset(&w2); |
| 554 | |
| 555 | pay = cson_new_object(); |
| 556 | |
| 557 |
| --- src/json_wiki.c | |
| +++ src/json_wiki.c | |
| @@ -546,11 +546,11 @@ | |
| 546 | blob_init(&w1, pW1->zWiki, -1); |
| 547 | blob_zero(&w2); |
| 548 | blob_init(&w2, pW2->zWiki, -1); |
| 549 | blob_zero(&d); |
| 550 | diffFlags = DIFF_IGNORE_EOLWS | DIFF_STRIP_EOLCR; |
| 551 | text_diff(&w1, &w2, &d, 0, diffFlags); |
| 552 | blob_reset(&w1); |
| 553 | blob_reset(&w2); |
| 554 | |
| 555 | pay = cson_new_object(); |
| 556 | |
| 557 |