Fossil SCM
corrections on merge conflict handling for settings help
Commit
309168a936d404a0ff4cddcd6e75c1f467c9a00a
Parent
f5740d09c3ed31a…
1 file changed
+9
-5
M
src/db.c
+9
-5
| --- src/db.c | ||
| +++ src/db.c | ||
| @@ -1597,10 +1597,14 @@ | ||
| 1597 | 1597 | ** localauth If enabled, require that HTTP connections from |
| 1598 | 1598 | ** 127.0.0.1 be authenticated by password. If |
| 1599 | 1599 | ** false, all HTTP requests from localhost have |
| 1600 | 1600 | ** unrestricted access to the repository. |
| 1601 | 1601 | ** |
| 1602 | +** manifest If enabled, automatically create files "manifest" and | |
| 1603 | +** "manifest.uuid" in every checkout. The SQLite and | |
| 1604 | +** Fossil repositories both require this. Default: off. | |
| 1605 | +** | |
| 1602 | 1606 | ** mtime-changes Use file modification times (mtimes) to detect when |
| 1603 | 1607 | ** files have been modified. (Default "on".) |
| 1604 | 1608 | ** |
| 1605 | 1609 | ** pgp-command Command used to clear-sign manifests at check-in. |
| 1606 | 1610 | ** The default is "gpg --clearsign -o ". |
| @@ -1640,19 +1644,19 @@ | ||
| 1640 | 1644 | ** |
| 1641 | 1645 | ** push-hook-privilege |
| 1642 | 1646 | ** if set, the user doing the push needs this privilege |
| 1643 | 1647 | ** to trigger the hook. Valid privileges are: |
| 1644 | 1648 | ** s (setup), a (admin), i (checkin) or o (checkout) |
| 1649 | +** | |
| 1650 | +** repo-cksum Compute checksums over all files in each checkout | |
| 1651 | +** as a double-check of correctness. Defaults to "on". | |
| 1652 | +** Disable on large repositories for a performance | |
| 1653 | +** improvement. | |
| 1645 | 1654 | ** |
| 1646 | 1655 | ** ssh-command Command used to talk to a remote machine with |
| 1647 | 1656 | ** the "ssh://" protocol. |
| 1648 | 1657 | ** |
| 1649 | -** repo-cksum Compute checksums over all files in each checkout | |
| 1650 | -** as a double-check of correctness. Defaults to "on". | |
| 1651 | -** Disable on large repositories for a performance | |
| 1652 | -** improvement. | |
| 1653 | -** | |
| 1654 | 1658 | ** web-browser A shell command used to launch your preferred |
| 1655 | 1659 | ** web browser when given a URL as an argument. |
| 1656 | 1660 | ** Defaults to "start" on windows, "open" on Mac, |
| 1657 | 1661 | ** and "firefox" on Unix. |
| 1658 | 1662 | ** |
| 1659 | 1663 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -1597,10 +1597,14 @@ | |
| 1597 | ** localauth If enabled, require that HTTP connections from |
| 1598 | ** 127.0.0.1 be authenticated by password. If |
| 1599 | ** false, all HTTP requests from localhost have |
| 1600 | ** unrestricted access to the repository. |
| 1601 | ** |
| 1602 | ** mtime-changes Use file modification times (mtimes) to detect when |
| 1603 | ** files have been modified. (Default "on".) |
| 1604 | ** |
| 1605 | ** pgp-command Command used to clear-sign manifests at check-in. |
| 1606 | ** The default is "gpg --clearsign -o ". |
| @@ -1640,19 +1644,19 @@ | |
| 1640 | ** |
| 1641 | ** push-hook-privilege |
| 1642 | ** if set, the user doing the push needs this privilege |
| 1643 | ** to trigger the hook. Valid privileges are: |
| 1644 | ** s (setup), a (admin), i (checkin) or o (checkout) |
| 1645 | ** |
| 1646 | ** ssh-command Command used to talk to a remote machine with |
| 1647 | ** the "ssh://" protocol. |
| 1648 | ** |
| 1649 | ** repo-cksum Compute checksums over all files in each checkout |
| 1650 | ** as a double-check of correctness. Defaults to "on". |
| 1651 | ** Disable on large repositories for a performance |
| 1652 | ** improvement. |
| 1653 | ** |
| 1654 | ** web-browser A shell command used to launch your preferred |
| 1655 | ** web browser when given a URL as an argument. |
| 1656 | ** Defaults to "start" on windows, "open" on Mac, |
| 1657 | ** and "firefox" on Unix. |
| 1658 | ** |
| 1659 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -1597,10 +1597,14 @@ | |
| 1597 | ** localauth If enabled, require that HTTP connections from |
| 1598 | ** 127.0.0.1 be authenticated by password. If |
| 1599 | ** false, all HTTP requests from localhost have |
| 1600 | ** unrestricted access to the repository. |
| 1601 | ** |
| 1602 | ** manifest If enabled, automatically create files "manifest" and |
| 1603 | ** "manifest.uuid" in every checkout. The SQLite and |
| 1604 | ** Fossil repositories both require this. Default: off. |
| 1605 | ** |
| 1606 | ** mtime-changes Use file modification times (mtimes) to detect when |
| 1607 | ** files have been modified. (Default "on".) |
| 1608 | ** |
| 1609 | ** pgp-command Command used to clear-sign manifests at check-in. |
| 1610 | ** The default is "gpg --clearsign -o ". |
| @@ -1640,19 +1644,19 @@ | |
| 1644 | ** |
| 1645 | ** push-hook-privilege |
| 1646 | ** if set, the user doing the push needs this privilege |
| 1647 | ** to trigger the hook. Valid privileges are: |
| 1648 | ** s (setup), a (admin), i (checkin) or o (checkout) |
| 1649 | ** |
| 1650 | ** repo-cksum Compute checksums over all files in each checkout |
| 1651 | ** as a double-check of correctness. Defaults to "on". |
| 1652 | ** Disable on large repositories for a performance |
| 1653 | ** improvement. |
| 1654 | ** |
| 1655 | ** ssh-command Command used to talk to a remote machine with |
| 1656 | ** the "ssh://" protocol. |
| 1657 | ** |
| 1658 | ** web-browser A shell command used to launch your preferred |
| 1659 | ** web browser when given a URL as an argument. |
| 1660 | ** Defaults to "start" on windows, "open" on Mac, |
| 1661 | ** and "firefox" on Unix. |
| 1662 | ** |
| 1663 |