Fossil SCM
Fix the "help" for the "gdiff-command" setting.
Commit
721c43ba9268dfdcde5d439773a97e06895f3c0dcb3d38c5c43b5c83d0a7fe55
Parent
8dcb0b8a5985c3e…
1 file changed
+2
-1
M
src/db.c
+2
-1
| --- src/db.c | ||
| +++ src/db.c | ||
| @@ -4844,11 +4844,12 @@ | ||
| 4844 | 4844 | ** manifest. |
| 4845 | 4845 | */ |
| 4846 | 4846 | /* |
| 4847 | 4847 | ** SETTING: gdiff-command width=40 sensitive |
| 4848 | 4848 | ** The value is an external command to run when performing a graphical |
| 4849 | -** diff. If undefined, text diff will be used. | |
| 4849 | +** diff. If undefined, a --tk diff is done if commands "tclsh" and "wish" | |
| 4850 | +** are on PATH, or a --by diff is done if "tclsh" or "wish" are unavailable. | |
| 4850 | 4851 | */ |
| 4851 | 4852 | /* |
| 4852 | 4853 | ** SETTING: gmerge-command width=40 sensitive |
| 4853 | 4854 | ** The value is a graphical merge conflict resolver command operating |
| 4854 | 4855 | ** on four files. Examples: |
| 4855 | 4856 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -4844,11 +4844,12 @@ | |
| 4844 | ** manifest. |
| 4845 | */ |
| 4846 | /* |
| 4847 | ** SETTING: gdiff-command width=40 sensitive |
| 4848 | ** The value is an external command to run when performing a graphical |
| 4849 | ** diff. If undefined, text diff will be used. |
| 4850 | */ |
| 4851 | /* |
| 4852 | ** SETTING: gmerge-command width=40 sensitive |
| 4853 | ** The value is a graphical merge conflict resolver command operating |
| 4854 | ** on four files. Examples: |
| 4855 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -4844,11 +4844,12 @@ | |
| 4844 | ** manifest. |
| 4845 | */ |
| 4846 | /* |
| 4847 | ** SETTING: gdiff-command width=40 sensitive |
| 4848 | ** The value is an external command to run when performing a graphical |
| 4849 | ** diff. If undefined, a --tk diff is done if commands "tclsh" and "wish" |
| 4850 | ** are on PATH, or a --by diff is done if "tclsh" or "wish" are unavailable. |
| 4851 | */ |
| 4852 | /* |
| 4853 | ** SETTING: gmerge-command width=40 sensitive |
| 4854 | ** The value is a graphical merge conflict resolver command operating |
| 4855 | ** on four files. Examples: |
| 4856 |