Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Fix the "help" for the "gdiff-command" setting. |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
721c43ba9268dfdcde5d439773a97e06 |
| User & Date: | drh 2025-03-17 16:58:27.053 |
Context
|
2025-03-17
| ||
| 17:13 | Do not allow the (undocumented) --debug option to mess up --tk output. check-in: d7cf189344 user: drh tags: trunk | |
| 16:58 | Fix the "help" for the "gdiff-command" setting. check-in: 721c43ba92 user: drh tags: trunk | |
| 16:53 | Improved error message when --tk fails. check-in: 8dcb0b8a59 user: drh tags: trunk | |
Changes
Changes to src/db.c.
| ︙ | ︙ | |||
4842 4843 4844 4845 4846 4847 4848 | ** send the "pragma avoid-delta-manifests" statement in its reply, ** which will cause the client to avoid generating a delta ** manifest. */ /* ** SETTING: gdiff-command width=40 sensitive ** The value is an external command to run when performing a graphical | | > | 4842 4843 4844 4845 4846 4847 4848 4849 4850 4851 4852 4853 4854 4855 4856 4857 | ** send the "pragma avoid-delta-manifests" statement in its reply, ** which will cause the client to avoid generating a delta ** manifest. */ /* ** SETTING: gdiff-command width=40 sensitive ** The value is an external command to run when performing a graphical ** diff. If undefined, a --tk diff is done if commands "tclsh" and "wish" ** are on PATH, or a --by diff is done if "tclsh" or "wish" are unavailable. */ /* ** SETTING: gmerge-command width=40 sensitive ** The value is a graphical merge conflict resolver command operating ** on four files. Examples: ** ** kdiff3 "%baseline" "%original" "%merge" -o "%output" |
| ︙ | ︙ |