Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Updated the meld example for the gmerge help output, from a fix suggested on the forum. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
375589e50ec65422dc4afb864e430ed3 |
| User & Date: | wyoung 2021-07-15 16:55:34 |
Context
|
2021-07-15
| ||
| 20:25 | Updated the systemd service article to account for my experience following the instructions on a CentOS 8 box. (It was originally written for an older Debian type platform.) ... (check-in: 74670ab1 user: wyoung tags: trunk) | |
| 16:55 | Updated the meld example for the gmerge help output, from a fix suggested on the forum. ... (check-in: 375589e5 user: wyoung tags: trunk) | |
| 16:32 | Fix a minor typo in a comment. ... (check-in: 56262c7e user: drh tags: trunk) | |
Changes
Changes to src/db.c.
| ︙ | ︙ | |||
3996 3997 3998 3999 4000 4001 4002 | /* ** 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" ** xxdiff "%original" "%baseline" "%merge" -M "%output" | | | 3996 3997 3998 3999 4000 4001 4002 4003 4004 4005 4006 4007 4008 4009 4010 | /* ** 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" ** xxdiff "%original" "%baseline" "%merge" -M "%output" ** meld "%baseline" "%original" "%merge" --output "%output" */ /* ** SETTING: hash-digits width=5 default=10 ** The number of hexadecimal digits of the SHA3 hash to display. */ /* ** SETTING: http-port width=16 default=8080 |
| ︙ | ︙ |