Fossil SCM
Fix the on-line help for the pgo-command and gdiff-command settings.
Commit
7aad2af7d39acbf148575e2f09d5a9e688eb89b9d776d8b7e415ab67a042ec3e
Parent
bf94ffa00994355…
1 file changed
+3
-4
M
src/db.c
+3
-4
| --- src/db.c | ||
| +++ src/db.c | ||
| @@ -2926,11 +2926,11 @@ | ||
| 2926 | 2926 | ** When executing certain external commands (e.g. diff and |
| 2927 | 2927 | ** gdiff), use relative paths. |
| 2928 | 2928 | */ |
| 2929 | 2929 | #endif |
| 2930 | 2930 | /* |
| 2931 | -** SETTING; gdiff-command width=40 default=gdiff | |
| 2931 | +** SETTING: gdiff-command width=40 default=gdiff | |
| 2932 | 2932 | ** The value is an external command to run when performing a graphical |
| 2933 | 2933 | ** diff. If undefined, text diff will be used. |
| 2934 | 2934 | */ |
| 2935 | 2935 | /* |
| 2936 | 2936 | ** SETTING: gmerge-command width=40 |
| @@ -3016,14 +3016,13 @@ | ||
| 3016 | 3016 | ** and "delete" commands will also remove the associated |
| 3017 | 3017 | ** files from within the checkout. |
| 3018 | 3018 | */ |
| 3019 | 3019 | #endif |
| 3020 | 3020 | /* |
| 3021 | -** SETTING; pgp-command width=40 | |
| 3022 | -** DEFAULT: gpg --clearsign -o | |
| 3023 | -** | |
| 3021 | +** SETTING: pgp-command width=40 | |
| 3024 | 3022 | ** Command used to clear-sign manifests at check-in. |
| 3023 | +** Default value is "gpg --clearsign -o" | |
| 3025 | 3024 | */ |
| 3026 | 3025 | /* |
| 3027 | 3026 | ** SETTING: proxy width=32 default=off |
| 3028 | 3027 | ** URL of the HTTP proxy. If undefined or "off" then |
| 3029 | 3028 | ** the "http_proxy" environment variable is consulted. |
| 3030 | 3029 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -2926,11 +2926,11 @@ | |
| 2926 | ** When executing certain external commands (e.g. diff and |
| 2927 | ** gdiff), use relative paths. |
| 2928 | */ |
| 2929 | #endif |
| 2930 | /* |
| 2931 | ** SETTING; gdiff-command width=40 default=gdiff |
| 2932 | ** The value is an external command to run when performing a graphical |
| 2933 | ** diff. If undefined, text diff will be used. |
| 2934 | */ |
| 2935 | /* |
| 2936 | ** SETTING: gmerge-command width=40 |
| @@ -3016,14 +3016,13 @@ | |
| 3016 | ** and "delete" commands will also remove the associated |
| 3017 | ** files from within the checkout. |
| 3018 | */ |
| 3019 | #endif |
| 3020 | /* |
| 3021 | ** SETTING; pgp-command width=40 |
| 3022 | ** DEFAULT: gpg --clearsign -o |
| 3023 | ** |
| 3024 | ** Command used to clear-sign manifests at check-in. |
| 3025 | */ |
| 3026 | /* |
| 3027 | ** SETTING: proxy width=32 default=off |
| 3028 | ** URL of the HTTP proxy. If undefined or "off" then |
| 3029 | ** the "http_proxy" environment variable is consulted. |
| 3030 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -2926,11 +2926,11 @@ | |
| 2926 | ** When executing certain external commands (e.g. diff and |
| 2927 | ** gdiff), use relative paths. |
| 2928 | */ |
| 2929 | #endif |
| 2930 | /* |
| 2931 | ** SETTING: gdiff-command width=40 default=gdiff |
| 2932 | ** The value is an external command to run when performing a graphical |
| 2933 | ** diff. If undefined, text diff will be used. |
| 2934 | */ |
| 2935 | /* |
| 2936 | ** SETTING: gmerge-command width=40 |
| @@ -3016,14 +3016,13 @@ | |
| 3016 | ** and "delete" commands will also remove the associated |
| 3017 | ** files from within the checkout. |
| 3018 | */ |
| 3019 | #endif |
| 3020 | /* |
| 3021 | ** SETTING: pgp-command width=40 |
| 3022 | ** Command used to clear-sign manifests at check-in. |
| 3023 | ** Default value is "gpg --clearsign -o" |
| 3024 | */ |
| 3025 | /* |
| 3026 | ** SETTING: proxy width=32 default=off |
| 3027 | ** URL of the HTTP proxy. If undefined or "off" then |
| 3028 | ** the "http_proxy" environment variable is consulted. |
| 3029 |