Fossil SCM
Fix very minor typo in comment.
Commit
76412c68f146f489e3a363927f7ffa012d08ee53
Parent
4440dae21237f86…
1 file changed
+1
-1
+1
-1
| --- src/merge.c | ||
| +++ src/merge.c | ||
| @@ -657,11 +657,11 @@ | ||
| 657 | 657 | } |
| 658 | 658 | db_finalize(&q); |
| 659 | 659 | |
| 660 | 660 | /* |
| 661 | 661 | ** Rename files that have taken a rename on P->M but which keep the same |
| 662 | - ** name o P->V. If a file is renamed on P->V only or on both P->V and | |
| 662 | + ** name on P->V. If a file is renamed on P->V only or on both P->V and | |
| 663 | 663 | ** P->M then we retain the V name of the file. |
| 664 | 664 | */ |
| 665 | 665 | db_prepare(&q, |
| 666 | 666 | "SELECT idv, fnp, fnm FROM fv" |
| 667 | 667 | " WHERE idv>0 AND idp>0 AND idm>0 AND fnp=fn AND fnm!=fnp" |
| 668 | 668 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -657,11 +657,11 @@ | |
| 657 | } |
| 658 | db_finalize(&q); |
| 659 | |
| 660 | /* |
| 661 | ** Rename files that have taken a rename on P->M but which keep the same |
| 662 | ** name o P->V. If a file is renamed on P->V only or on both P->V and |
| 663 | ** P->M then we retain the V name of the file. |
| 664 | */ |
| 665 | db_prepare(&q, |
| 666 | "SELECT idv, fnp, fnm FROM fv" |
| 667 | " WHERE idv>0 AND idp>0 AND idm>0 AND fnp=fn AND fnm!=fnp" |
| 668 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -657,11 +657,11 @@ | |
| 657 | } |
| 658 | db_finalize(&q); |
| 659 | |
| 660 | /* |
| 661 | ** Rename files that have taken a rename on P->M but which keep the same |
| 662 | ** name on P->V. If a file is renamed on P->V only or on both P->V and |
| 663 | ** P->M then we retain the V name of the file. |
| 664 | */ |
| 665 | db_prepare(&q, |
| 666 | "SELECT idv, fnp, fnm FROM fv" |
| 667 | " WHERE idv>0 AND idp>0 AND idm>0 AND fnp=fn AND fnm!=fnp" |
| 668 |